From e8f07a17db6c11365fec98d2048fef7356210b8c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 16 Oct 2014 13:38:38 -0500
Subject: fix local disk mount, use [[:blank:]]

---
 package/base-files/src/etc/init.d/fs | 4 ++--
 package/base-files/src/etc/mdev/fs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/base-files/src')

diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index 9527070a1..b110af3b9 100755
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -24,14 +24,14 @@ for fs in $fstypes; do
 	disks=$(grep -v "^#" /etc/fstab|grep $fs|awk '{ print $1 }')
 	for disk in $disks; do
 		logger -t 'Filesystem' "Found $disk with filesystem $fs"
-		mnt=$(grep -v "^#" /etc/fstab|grep "$disk "|awk '{ print $2 }')
+		mnt=$(grep -v "^#" /etc/fstab|grep "${disk}[[:blank:]]"|awk '{ print $2 }')
 		grep $fs /proc/filesystems >/dev/null 2>&1
 		if [ $? -eq 0 ];then
 			[ -x /usr/sbin/fsck.$fs ] && {
 				logger -t 'Filesystem' "checking $fs filesystem on $disk"
 				fsck -p $disk >/dev/null 2>&1
 			}
-			logger -t 'Filesystem' "Mounting local filesystems"
+			logger -t 'Filesystem' "Mounting $disk to $mnt"
 			mkdir -p $mnt > /dev/null 2>&1
 			mount $disk
 		else
diff --git a/package/base-files/src/etc/mdev/fs b/package/base-files/src/etc/mdev/fs
index 6c8b08699..084ecd9a1 100755
--- a/package/base-files/src/etc/mdev/fs
+++ b/package/base-files/src/etc/mdev/fs
@@ -46,7 +46,7 @@ adk_mount() {
 	mkdir -p $mnt >/dev/null 2>&1
 	grep $procfs /proc/filesystems >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		logger -t mdev "Mounting local filesystems"
+		logger -t mdev "Mounting $disk to $mnt"
 		mount $mnt
 		if [ $? -ne 0 ];then
 			logger -s -t 'Filesystem' "Mounting $disk failed"
-- 
cgit v1.2.3


From 382c3be6e3fd59660516b4315dee70f5cdded0a8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 17 Oct 2014 23:25:25 -0500
Subject: be more quiet

---
 package/base-files/src/etc/mdev/fs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/base-files/src')

diff --git a/package/base-files/src/etc/mdev/fs b/package/base-files/src/etc/mdev/fs
index 084ecd9a1..4f1e100f4 100755
--- a/package/base-files/src/etc/mdev/fs
+++ b/package/base-files/src/etc/mdev/fs
@@ -26,7 +26,7 @@ fi
 
 # check if already mounted via /etc/init.d/fs
 adk_check() {
-	mount | grep "${MDEV} "
+	mount | grep "${MDEV}[[:blank:]]"
 	if [ $? -eq 0 ];then
 		logger -t mdev "Filesystem on ${MDEV} already mounted"
 		exit 0
@@ -47,7 +47,7 @@ adk_mount() {
 	grep $procfs /proc/filesystems >/dev/null 2>&1
 	if [ $? -eq 0 ];then
 		logger -t mdev "Mounting $disk to $mnt"
-		mount $mnt
+		mount $mnt 2>/dev/null
 		if [ $? -ne 0 ];then
 			logger -s -t 'Filesystem' "Mounting $disk failed"
 		fi
-- 
cgit v1.2.3