[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

["William Hubbs" <williamh@gentoo.org>]

commit:     0ed42d35995bc6c35a6b6fe02a5164c4fa73a71c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 21:58:40 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 21:58:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=0ed42d35

fix mounting logic in udev-mount

Udev-mount now follows the following logic:

1. If there is an entry in fstab for /dev:
a. If /dev is mounted, remount it according to fstab.
b. Otherwise, mount it according to fstab.

2. Otherwise, if /dev is not mounted:
a. Mount it with default settings.
B. Otherwise, output a message and use the mounted /dev.

Reported-by: duncan <1i5t5.duncan <AT> cox.net>
X-Gentoo-Bug: 402845
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=402845

---
 init.d/udev-mount |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 096e710..676643f 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -11,33 +11,34 @@ depend()
 
 mount_dev_directory()
 {
-	local rc=0
+	local mounted=false fstab=false action=--mount msg=Mounting rc=0
 
-	if mountinfo -q -f devtmpfs /dev; then
-		einfo "/dev is already mounted"
-		return 0
+	if ! grep -qs devtmpfs /proc/filesystems; then
+		eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
+		eerror "This means that CONFIG_DEVTMPFS=y is required"
+		eerror "in the kernel configuration."
+		return 1
 	fi
 
+	# Is /dev already a mounted devtmpfs?
+	mountinfo -q -f devtmpfs /dev && mounted=true
+
 	# If an entry for /dev exists in fstab it must be a devtmpfs.
-	if fstabinfo -q /dev && ! fstabinfo -q -f devtmpfs /dev; then
-		eerror "The entry in /etc/fstab is not correct."
-		eerror "Udev requires it to be a devtmpfs file system."
-		return 1
-	fi
+	fstabinfo -q -t devtmpfs /dev && fstab=true
 
 	# No options are processed here as they should all be in /etc/fstab
-	ebegin "Mounting /dev"
-	if ! fstabinfo --mount /dev; then
-		if grep -qs devtmpfs /proc/filesystems; then
-			# Some devices require exec, Bug #92921
-			mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
-			rc=$?
-		else
-			eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
-			eerror "This means that CONFIG_DEVTMPFS=y is required"
-			eerror "in the kernel configuration."
-			return 1
-		fi
+	if $fstab; then
+		$mounted && action=--remount && msg=Remounting
+		ebegin "$msg /dev according to /etc/fstab"
+		fstabinfo $action /dev
+		rc=$?
+	elif ! $mounted; then
+		ebegin "Mounting /dev"
+		# Some devices require exec, Bug #92921
+		mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
+		rc=$?
+	else
+		ebegin "Using /dev mounted from kernel"
 	fi
 
 	eend $rc