[Pkg-sysvinit-commits] r531 - sysvinit/trunk/debian/initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-05 13:41:42 +0000 (Thu, 05 Jan 2006)
New Revision: 531

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Log:
Catch cases of bad readlink output and absent /etc when initializing mtab file

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-05 12:07:47 UTC (rev 530)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-05 13:41:42 UTC (rev 531)
@@ -362,9 +362,12 @@
 		then
 			log_failure_msg "Cannot initialize ${MTAB_PATH}."
 		else
-			log_failure_msg "Cannot initialize the mtab file."
+			log_failure_msg "Cannot initialize /etc/mtab."
 		fi
 		;;
+	  *)
+		log_failure_msg "Illegal mtab location '${MTAB_PATH}'."
+		;;
 	esac
 
 	if [ "$INIT_MTAB_FILE" = yes ]

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2006-01-05 12:07:47 UTC (rev 530)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2006-01-05 13:41:42 UTC (rev 531)
@@ -39,17 +39,29 @@
 	MOUNT_N=-n
 	MTAB_PATH="$(readlink -f /etc/mtab || :)"
 	case "$MTAB_PATH" in
-		/proc/*)
-			# Assume that /proc/ is not writable
-			;;
-		/*)
-			# Only update mtab if it is writable
-			if touch "$MTAB_PATH" >/dev/null 2>&1
-			then
-				DO_MTAB=Yes
-				MOUNT_N=
-			fi
-			;;
+	  /proc/*)
+		# Assume that /proc/ is not writable
+		;;
+	  /*)
+		# Only update mtab if it is writable
+		if touch "$MTAB_PATH" >/dev/null 2>&1
+		then
+			DO_MTAB=Yes
+			MOUNT_N=
+		fi
+		;;
+	  "")
+		[ -L /etc/mtab ] && MTAB_PATH="$(readlink /etc/mtab)"
+		if [ "$MTAB_PATH" ]
+		then
+			log_failure_msg "Cannot initialize ${MTAB_PATH}."
+		else
+			log_failure_msg "Cannot initialize /etc/mtab."
+		fi
+		;;
+	  *)
+		log_failure_msg "Illegal mtab location '${MTAB_PATH}'."
+		;;
 	esac
 	if [ "$DO_MTAB" ] && [ ! -f /etc/mtab ]
 	then