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

Fix some minor problems.

This commit is contained in:
vermaden 2022-05-03 22:29:46 +02:00
parent 048d1e57bf
commit 1dff7fd13f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
automount
View File

@ -144,7 +144,6 @@ NICENAMES (set to NO by default)
example: NICENAMES=YES example: NICENAMES=YES
IGNORE_SYS_PARTS (set to NO by default) IGNORE_SYS_PARTS (set to NO by default)
If set to YES automount(8) will ignore system partitions like EFI or MSR. If set to YES automount(8) will ignore system partitions like EFI or MSR.
@ -168,7 +167,7 @@ then
echo " / / // / // // / // \\\ \ \ \\\ \ \\\ \ \\\ \ \\\ \_ " echo " / / // / // // / // \\\ \ \ \\\ \ \\\ \ \\\ \ \\\ \_ "
echo " \_____\\\____/ \__\\\____//__________\\\__\__\__\\\____/ \_____\\\__\__\\\___\ " echo " \_____\\\____/ \__\\\____//__________\\\__\__\__\\\____/ \_____\\\__\__\\\___\ "
echo echo
echo "automount 1.7.7 2022/02/20" echo "automount 1.7.8 2022/05/03"
exit 0 exit 0
fi fi
@ -196,8 +195,8 @@ fi
: ${FAT_CODEPAGE='cp437'} # US/Canada : ${FAT_CODEPAGE='cp437'} # US/Canada
: ${ISO9660_CODEPAGE='UTF-8'} # UTF-8 : ${ISO9660_CODEPAGE='UTF-8'} # UTF-8
: ${ATIME='NO'} # when NO mount with noatime : ${ATIME='NO'} # when NO mount with noatime
: ${RETRY_COUNT='3'} # retry count : ${RETRY_COUNT='5'} # retry count
: ${RETRY_DELAY='1'} # retry delay time : ${RETRY_DELAY='2'} # retry delay time
: ${USERUMOUNT='NO'} # when YES add suid bit to umount(8) : ${USERUMOUNT='NO'} # when YES add suid bit to umount(8)
: ${NOTIFY='NO'} # use notify-send(1) (devel/libnotify) : ${NOTIFY='NO'} # use notify-send(1) (devel/libnotify)
: ${WALL='NO'} # use wall(1) : ${WALL='NO'} # use wall(1)
@ -264,7 +263,7 @@ __guess_fs_type() { # 1=DEV
case ${FS_TYPE} in case ${FS_TYPE} in
(*Unix\ Fast\ File*) return ${FS_TYPE_UFS} ;; (*Unix\ Fast\ File*) return ${FS_TYPE_UFS} ;;
(*NTFS*) return ${FS_TYPE_NTFS} ;; (*NTFS*) return ${FS_TYPE_NTFS} ;;
(*FAT*|*MSDOS*) return ${FS_TYPE_FAT} ;; (*\ FAT\ *|*MSDOS*) return ${FS_TYPE_FAT} ;;
esac esac
# try with fstyp(8) last (exFAT on UFS issue) # try with fstyp(8) last (exFAT on UFS issue)
unset FS_TYPE unset FS_TYPE
@ -729,7 +728,7 @@ case ${2} in
__log "${DEV}: detach" __log "${DEV}: detach"
if [ -f ${STATE} ] if [ -f ${STATE} ]
then then
grep -E "^/dev/${1}" ${STATE} \ grep -E "^/dev/${1} " ${STATE} \
| while read DEV PROVIDER MNT | while read DEV PROVIDER MNT
do do
TARGET=$( mount | grep -v \.gvfs | grep -m 1 -E "^${PROVIDER} " | awk '{print $3}' ) TARGET=$( mount | grep -v \.gvfs | grep -m 1 -E "^${PROVIDER} " | awk '{print $3}' )
@ -739,6 +738,7 @@ case ${2} in
continue continue
fi fi
( # put entire umount/find/rm block into background ( # put entire umount/find/rm block into background
umount -f "${TARGET}" 1> /dev/null 2>&1
umount -f "${TARGET}" 1> /dev/null 2>&1 umount -f "${TARGET}" 1> /dev/null 2>&1
__log "${DEV}: (state) umount '${TARGET}'" __log "${DEV}: (state) umount '${TARGET}'"
__remove_dir "${TARGET}" & __remove_dir "${TARGET}" &