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

[William Hubbs]

commit:     6fa0d6318bcd5c98548cff2ff840bca116892ca5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct  7 16:35:31 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 16:35:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6fa0d631

mtab: fix update logic

This advises users to remove mtab from their runlevels if /etc/mtab is a
symlink, and it creates the symlink if /etc/mtab does not exist on a
system.

X-Gentoo-Bug: 560060
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=560060

 init.d/mtab.in | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/init.d/mtab.in b/init.d/mtab.in
index 51575b4..1442ffd 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -12,21 +12,18 @@ depend()
 
 start()
 {
-	[ -L /etc/mtab ] && return 0
 	local rc=0
 	ebegin "Updating /etc/mtab"
-	if ! checkpath -W /etc; then
+	if [ -L /etc/mtab ] ; then
+		ewarn "/etc/mtab is a symlink, not updating."
+		ewarn "FYI - You can safely remove mtab from your runlevels."
+	elif ! checkpath -W /etc; then
 		rc=1
 	elif [ ! -e /etc/mtab ]; then
+		einfo "Creating mtab symlink"
 		ln -snf /proc/self/mounts /etc/mtab
 	else
-		ewarn "The support for updating /etc/mtab as a file is"
-		ewarn "deprecated and will be removed in the future."
-		ewarn "Please run the following command as root on your system."
-		ewarn
-		ewarn "ln -snf /proc/self/mounts /etc/mtab"
-		ewarn
-
+		einfo "Updating mtab file"
 		# With / as tmpfs we cannot umount -at tmpfs in localmount as that
 		# makes / readonly and dismounts all tmpfs even if in use which is
 		# not good. Luckily, umount uses /etc/mtab instead of /proc/mounts