From 26bc6c9fe57e4e516cd4f3a6d133ceea84a1a9c3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sun, 13 Nov 2016 12:09:49 +0100
Subject: finetune disk mount scripts

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

(limited to 'package/base-files')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7d7df3366..4a8b4c5f2 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.1
-PKG_RELEASE:=		21
+PKG_RELEASE:=		22
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index b6adb4ce4..55e2c3449 100755
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -6,14 +6,14 @@
 [ -x /sbin/swapon ] && {
 	grep swap /etc/fstab >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		logger -t '' "Activating swap"
+		logger -t 'SWAP' "Activating swap"
 		swapon -a
 	fi
 }
 
 # activate any logical volumes
 [ -x /usr/sbin/lvm ] && {
-	logger -t '' "Activating LVM volumes"
+	logger -t 'LVM' "Activating LVM volumes"
 	lvm vgscan
 	lvm vgchange -ay
 }
@@ -40,10 +40,10 @@ for fs in $fstypes; do
 				logger -t 'Filesystem' "Mounting $disk to $mnt"
 				mount $disk
 			else
-				logger -s -t 'Filesystem' "Skipping mounting $disk, device file missing"
+				logger -t 'Filesystem' "Skipping mounting $disk, device file missing"
 			fi
 		else
-			logger -s -t 'Filesystem' "No $procfs filesystem in kernel"
+			logger -t 'Filesystem' "No $procfs filesystem in kernel"
 		fi
 	done
 done
diff --git a/package/base-files/src/etc/mdev/fs b/package/base-files/src/etc/mdev/fs
index 678aadc8a..86c4cee2f 100755
--- a/package/base-files/src/etc/mdev/fs
+++ b/package/base-files/src/etc/mdev/fs
@@ -47,9 +47,9 @@ 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>> /tmp/mount.err
 		if [ $? -ne 0 ]; then
-			logger -t mdev "Mounting $disk failed"
+			logger -t mdev "Mounting $disk failed with $?"
 		fi
 	else
 		logger -t mdev "Required filesystem $procfs not available"
-- 
cgit v1.2.3