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

Use /sbin/e2fsck from FreeBSD base system. Fix typo at /var/log/automount.log error message.

This commit is contained in:
Slawomir Wojciech Wojtczak (vermaden) 2013-03-07 18:43:09 +01:00
parent 4df5aca19f
commit 0078d1817e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
automount
View File

@ -35,7 +35,6 @@ It needs these ports to mount NTFS/exFAT/EXT4 respectively:
o sysutils/fusefs-ntfs o sysutils/fusefs-ntfs
o sysutils/fusefs-exfat o sysutils/fusefs-exfat
o sysutils/fusefs-ext4fuse o sysutils/fusefs-ext4fuse
o sysutils/e2fsprogs
By default it mounts/unmounts all removable media but By default it mounts/unmounts all removable media but
it is possible to set some additional options at the it is possible to set some additional options at the
@ -118,7 +117,7 @@ EOF
if [ "${1}" = "--version" ] if [ "${1}" = "--version" ]
then then
echo "automount 1.4.3 2013/03/06" echo "automount 1.4.3 2013/03/07"
exit 0 exit 0
fi fi
@ -207,7 +206,7 @@ __check_already_mounted() { # 1=(-d|-m) 2=(DEV|MNT)
if echo "${MOUNT}" | grep -q " on ${2} " if echo "${MOUNT}" | grep -q " on ${2} "
then then
local DEVICE="$( echo "${MOUNT}" | grep " on ${2} " | awk '{print $1}' )" local DEVICE="$( echo "${MOUNT}" | grep " on ${2} " | awk '{print $1}' )"
__log "${DEVICE}: -m already mounted on '${2}' mount point" __log "${DEVICE}: already mounted on '${2}' mount point"
exit 0 exit 0
fi fi
;; ;;
@ -311,7 +310,7 @@ case ${2} in
(*ext2*) (*ext2*)
__create_mount_point ${DEV} __create_mount_point ${DEV}
__wait_for_device ${DEV} __wait_for_device ${DEV}
fsck.ext2 -y ${DEV} \ e2fsck -y ${DEV} \
| while read LINE | while read LINE
do do
__log "${DEV}: fsck.ext2 ${LINE}" __log "${DEV}: fsck.ext2 ${LINE}"
@ -329,7 +328,7 @@ case ${2} in
(*ext3*) (*ext3*)
__create_mount_point ${DEV} __create_mount_point ${DEV}
__wait_for_device ${DEV} __wait_for_device ${DEV}
fsck.ext3 -y ${DEV} \ e2fsck -y ${DEV} \
| while read LINE | while read LINE
do do
__log "${DEV}: fsck.ext3 ${LINE}" __log "${DEV}: fsck.ext3 ${LINE}"
@ -347,7 +346,7 @@ case ${2} in
(*ext4*) (*ext4*)
__create_mount_point ${DEV} __create_mount_point ${DEV}
__wait_for_device ${DEV} __wait_for_device ${DEV}
fsck.ext4 -y ${DEV} \ e2fsck -y ${DEV} \
| while read LINE | while read LINE
do do
__log "${DEV}: fsck.ext4 ${LINE}" __log "${DEV}: fsck.ext4 ${LINE}"