[Pkg-sysvinit-commits] r1941 - in sysvinit/trunk/debian: . src/initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2010-08-10 05:53:46 +0000 (Tue, 10 Aug 2010)
New Revision: 1941

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh
Log:
Fix typo introduced when fixing #526398 and make sure the root
file system is only checked if it is specified in /etc/fstab that
it should be checked, to avoid breaking boot when root is on NFS
(Closes: #592427).


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-07-03 07:54:40 UTC (rev 1940)
+++ sysvinit/trunk/debian/changelog	2010-08-10 05:53:46 UTC (rev 1941)
@@ -1,3 +1,13 @@
+sysvinit (2.88dsf-12) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Fix typo introduced when fixing #526398 and make sure the root
+    file system is only checked if it is specified in /etc/fstab that
+    it should be checked, to avoid breaking boot when root is on NFS
+    (Closes: #592427).
+	
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 10 Aug 2010 07:51:38 +0200
+
 sysvinit (2.88dsf-11) unstable; urgency=low
 
   * Avoid /usr/bin/find in init.d/urandom to be able to run it before

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh	2010-07-03 07:54:40 UTC (rev 1940)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/checkroot.sh	2010-08-10 05:53:46 UTC (rev 1941)
@@ -198,7 +198,6 @@
 #			rootcheck=no
 #		fi
 #	fi
-	rootcheck=yes
 
 	#
 	# See if we want to check the root file system.