From 0078d1817e42ccb07955fcde64ed2e95c70fe249 Mon Sep 17 00:00:00 2001 From: "Slawomir Wojciech Wojtczak (vermaden)" Date: Thu, 7 Mar 2013 18:43:09 +0100 Subject: [PATCH] Use /sbin/e2fsck from FreeBSD base system. Fix typo at /var/log/automount.log error message. --- automount | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/automount b/automount index 3c744d5..24f9c16 100755 --- a/automount +++ b/automount @@ -35,7 +35,6 @@ It needs these ports to mount NTFS/exFAT/EXT4 respectively: o sysutils/fusefs-ntfs o sysutils/fusefs-exfat o sysutils/fusefs-ext4fuse - o sysutils/e2fsprogs By default it mounts/unmounts all removable media but it is possible to set some additional options at the @@ -118,7 +117,7 @@ EOF if [ "${1}" = "--version" ] then - echo "automount 1.4.3 2013/03/06" + echo "automount 1.4.3 2013/03/07" exit 0 fi @@ -207,7 +206,7 @@ __check_already_mounted() { # 1=(-d|-m) 2=(DEV|MNT) if echo "${MOUNT}" | grep -q " on ${2} " then 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 fi ;; @@ -311,7 +310,7 @@ case ${2} in (*ext2*) __create_mount_point ${DEV} __wait_for_device ${DEV} - fsck.ext2 -y ${DEV} \ + e2fsck -y ${DEV} \ | while read LINE do __log "${DEV}: fsck.ext2 ${LINE}" @@ -329,7 +328,7 @@ case ${2} in (*ext3*) __create_mount_point ${DEV} __wait_for_device ${DEV} - fsck.ext3 -y ${DEV} \ + e2fsck -y ${DEV} \ | while read LINE do __log "${DEV}: fsck.ext3 ${LINE}" @@ -347,7 +346,7 @@ case ${2} in (*ext4*) __create_mount_point ${DEV} __wait_for_device ${DEV} - fsck.ext4 -y ${DEV} \ + e2fsck -y ${DEV} \ | while read LINE do __log "${DEV}: fsck.ext4 ${LINE}"