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

[Petter Reinholdtsen]

Author: pere
Date: 2009-06-23 11:05:45 +0000 (Tue, 23 Jun 2009)
New Revision: 1335

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Comment out the code disabling fsck when running on battery.  It
need changes in fsck to work properly (Closes: #526398).  This
Reopens #326647.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-06-23 10:53:50 UTC (rev 1334)
+++ sysvinit/trunk/debian/changelog	2009-06-23 11:05:45 UTC (rev 1335)
@@ -68,6 +68,9 @@
   [ Petter Reinholdtsen ]
   * Move the startpar binary to a more proper location, from sysvinit
     to sysvinit-utils.
+  * Comment out the code disabling fsck when running on battery.  It
+    need changes in fsck to work properly (Closes: #526398).  This
+    Reopens #326647.
 
  -- Kel Modderman <kel at otaku42.de>  Tue, 23 Jun 2009 20:40:49 +1000
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-06-23 10:53:50 UTC (rev 1334)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2009-06-23 11:05:45 UTC (rev 1335)
@@ -23,16 +23,20 @@
 	# See if we're on AC Power.  If not, we're not gonna run our
 	# check.  If on_ac_power (in /usr/) is unavailable, behave as
 	# before and check all file systems needing it.
-	if which on_ac_power >/dev/null 2>&1
-	then
-		on_ac_power >/dev/null 2>&1
-		if [ $? -eq 1 ]
-		then
-			[ "$VERBOSE" = no ] || log_success_msg "Running on battery power, so skipping file system check."
-			BAT=yes
-		fi
-	fi
 
+# Disabled AC power check until fsck can be told to only check the
+# file system if it is corrupt when running on battery. (bug #526398)
+#	if which on_ac_power >/dev/null 2>&1
+#	then
+#		on_ac_power >/dev/null 2>&1
+#		if [ $? -eq 1 ]
+#		then
+#			[ "$VERBOSE" = no ] || log_success_msg "Running on battery power, so skipping file system check."
+#			BAT=yes
+#		fi
+#	fi
+	BAT=""
+
 	#
 	# Check the rest of the file systems.
 	#

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-06-23 10:53:50 UTC (rev 1334)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2009-06-23 11:05:45 UTC (rev 1335)
@@ -192,15 +192,18 @@
 	# See if we're on AC Power.  If not, we're not gonna run our
 	# check.  If on_ac_power (in /usr/) is unavailable, behave as
 	# before and check all file systems needing it.
-	if which on_ac_power >/dev/null 2>&1 && [ "$rootcheck" = yes ]
-	then
-		on_ac_power >/dev/null 2>&1
-		if [ "$?" -eq 1 ]
-		then
-			log_warning_msg "On battery power, so skipping file system check."
-			rootcheck=no
-		fi
-	fi
+# Disabled AC power check until fsck can be told to only check the
+# file system if it is corrupt when running on battery. (bug #526398)
+#	if which on_ac_power >/dev/null 2>&1 && [ "$rootcheck" = yes ]
+#	then
+#		on_ac_power >/dev/null 2>&1
+#		if [ "$?" -eq 1 ]
+#		then
+#			log_warning_msg "On battery power, so skipping file system check."
+#			rootcheck=no
+#		fi
+#	fi
+	rootcheck=yes
 
 	#
 	# See if we want to check the root file system.