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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-11 15:31:23 +0000 (Sun, 11 Dec 2005)
New Revision: 361

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
Log:
Report fsck failure codes; fix exit status handling

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-12-10 21:40:35 UTC (rev 360)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-12-11 15:31:23 UTC (rev 361)
@@ -87,7 +87,7 @@
 			FSCKCODE=$?
 			if [ "$FSCKCODE" -gt 1 ]
 			then
-				log_action_end_msg 1
+				log_action_end_msg 1 "code $FSCKCODE"
 				handle_failed_fsck
 			else
 				log_action_end_msg 0

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-12-10 21:40:35 UTC (rev 360)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-12-11 15:31:23 UTC (rev 361)
@@ -278,7 +278,7 @@
 			log_action_begin_msg "Checking root file system"
 			logsave -s $FSCK_LOGFILE fsck $spinner $force $fix -t $roottype $rootdev
 			FSCKCODE=$?
-			log_action_end_msg $FSCKCODE
+			log_action_end_msg $FSCKCODE "code $FSCKCODE"
 		fi
 	fi
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-12-10 21:40:35 UTC (rev 360)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-12-11 15:31:23 UTC (rev 361)
@@ -82,8 +82,9 @@
 				else
 					log_action_begin_msg "Starting portmap"
 					start-stop-daemon --start --quiet --exec /sbin/portmap
+					ES=$?
 					sleep 2  # FIXME: Actually synchronize with the process?
-					log_action_end_msg $?
+					log_action_end_msg $ES
 				fi
 			fi
 		fi
@@ -115,7 +116,7 @@
 				then
 					log_action_end_msg 0
 				else
-					log_action_end_msg 1
+					log_action_end_msg 1 "code $ES"
 				fi
 			fi
 		fi

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-12-10 21:40:35 UTC (rev 360)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-12-11 15:31:23 UTC (rev 361)
@@ -19,7 +19,8 @@
 	#     mount -n -o remount,ro /
 	# will act on a bind mount of / if there is one.  See #339023.
 	mount -n -o remount,ro -t dummy dummy /
-	[ "$VERBOSE" != no ] && log_action_end_msg $?
+	ES=$?
+	[ "$VERBOSE" != no ] && log_action_end_msg $ES
 }
 
 case "$1" in