OS
/
automount
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new NTFS options. Add nested NTFS mount attempt. Fix devd(8) config.

This commit is contained in:
Slawomir Wojciech Wojtczak (vermaden) 2014-08-01 10:24:50 +02:00
parent b265a81108
commit fb424421fe
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
automount
View File

@ -298,7 +298,7 @@ case ${2} in
(*FAT*) # must be before NTFS section because: newfs_msdos -O NTFS -L NTFS (*FAT*) # must be before NTFS section because: newfs_msdos -O NTFS -L NTFS
__create_mount_point ${DEV} __create_mount_point ${DEV}
__wait_for_device ${DEV} __wait_for_device ${DEV}
fsck_msdosfs -y ${DEV} \ fsck_msdosfs -C -y ${DEV} \
| while read LINE | while read LINE
do do
__log "${DEV}: fsck_msdosfs ${LINE}" __log "${DEV}: fsck_msdosfs ${LINE}"
@ -320,13 +320,19 @@ case ${2} in
if which ntfs-3g 1> /dev/null 2> /dev/null # sysutils/fusefs-ntfs if which ntfs-3g 1> /dev/null 2> /dev/null # sysutils/fusefs-ntfs
then then
__wait_for_device ${DEV} __wait_for_device ${DEV}
if ntfs-3g -o remove_hiberfile ${OPTS} ${DEV} ${MNT} if ntfs-3g -o recover -o remove_hiberfile ${OPTS} ${DEV} ${MNT}
then
ADD=1
else
# make nested mount try because sometimes second mount works
if ntfs-3g -o recover -o remove_hiberfile ${OPTS} ${DEV} ${MNT}
then then
ADD=1 ADD=1
else else
__log "${DEV}: mount failed (ntfs) 'ntfs-3g ${OPTS} ${DEV} ${MNT}'" __log "${DEV}: mount failed (ntfs) 'ntfs-3g ${OPTS} ${DEV} ${MNT}'"
exit 1 exit 1
fi fi
fi
else else
if ! [ "${USER}" = 0 ] if ! [ "${USER}" = 0 ]
then then