From acf07844473e79c26a564e6a819c3a424b23665d Mon Sep 17 00:00:00 2001 From: vermaden Date: Wed, 29 Apr 2020 12:42:13 +0200 Subject: [PATCH] Phase out support for sysutils/fusefs-ext4fuse port. Fix UMASK for exFAT filesystems. Fix ISO9660 mount options. --- automount | 14 ++++++-------- automount-1.7.2.tar.gz | Bin 0 -> 6670 bytes 2 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 automount-1.7.2.tar.gz diff --git a/automount b/automount index a1563b9..03315b3 100644 --- a/automount +++ b/automount @@ -144,7 +144,7 @@ if [ "${1}" = '--version' -o \ "${1}" = 'version' -o \ "${1}" = '-v' ] then - echo "automount 1.7.2 2019/12/15" + echo "automount 1.7.2 2020/01/14" exit 0 fi @@ -446,7 +446,7 @@ case ${2} in FS_CHECK_CMD='' FS_CHECK_ARGS='' FS_MOUNT_CMD='mount' - FS_MOUNT_ARGS="-t cd9660 -C=${ISO9660_CODEPAGE} ${DEV} ${MNT}" + FS_MOUNT_ARGS="-t cd9660 -o -e,-C=${ISO9660_CODEPAGE} ${DEV} ${MNT}" ;; (${FS_TYPE_UFS}) FS_CHECK_CMD='fsck_ufs' @@ -472,9 +472,6 @@ case ${2} in FS_CHECK_PORT='sysutils/e2fsprogs' FS_CHECK_CMD='fsck.ext4' FS_CHECK_ARGS="-y" -# FS_MOUNT_PORT='sysutils/fusefs-ext4fuse' -# FS_MOUNT_CMD='ext4fuse' -# FS_MOUNT_ARGS="${DEV} ${MNT}" FS_MOUNT_PORT='sysutils/fusefs-lkl' FS_MOUNT_CMD='lklfuse' FS_MOUNT_ARGS="-o type=ext4 -o allow_other -o intr -o uid=${UID} -o gid=${GID} -o umask=002 ${DEV} ${MNT}" @@ -511,7 +508,8 @@ case ${2} in FS_CHECK_CMD='fsck.exfat' FS_CHECK_ARGS="-y" FS_MOUNT_CMD='mount.exfat' - FS_MOUNT_ARGS="-o uid=${UID} -o gid=${GID} -o dmask=022 -o fmask=133 ${OPTS} ${DEV} ${MNT}" + FS_MOUNT_UMASK=$( printf "%03o" $((~0775&0777)) ) + FS_MOUNT_ARGS="-o uid=${UID} -o gid=${GID} -o umask=${FS_MOUNT_UMASK} ${OPTS} ${DEV} ${MNT}" FS_MOUNT_PORT='sysutils/fusefs-exfat' ;; (${FS_TYPE_NTFS}) @@ -589,7 +587,7 @@ case ${2} in fi __wait_for_device "${DEV}" COUNT=0 - while ! ${FS_MOUNT_CMD} ${FS_MOUNT_ARGS} + while ! ${FS_MOUNT_CMD} ${FS_MOUNT_ARGS} 2> /dev/null do if [ ! -e "${DEV}" ] then @@ -627,7 +625,7 @@ case ${2} in then continue fi - __log "${DEV}: starting '${FM}' file manager" + __log "${DEV}: starting '${FM}' file manager" su -l "${I}" -c "env DISPLAY=${DISPLAY_ID} ${FM} ${MNT} &" 1> /dev/null 2>&1 done fi diff --git a/automount-1.7.2.tar.gz b/automount-1.7.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e56af3cfb40dc404a37b26d6a7dd7a764ea165be GIT binary patch literal 6670 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 YegAy_eE)p^{Qvm;H&qOWVE|$P0496vVE_OC literal 0 HcmV?d00001