--- sysvinit-2.86.ds1-/debian/initscripts/etc/init.d/checkfs.sh	Fri Dec  3 08:35:37 2010
+++ sysvinit-2.86.ds1/debian/initscripts/etc/init.d/checkfs.sh	Fri Dec  3 08:35:37 2010
@@ -23,15 +23,19 @@
 	# 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.
--- sysvinit-2.86.ds1-/debian/initscripts/etc/init.d/checkroot.sh	Fri Dec  3 08:35:37 2010
+++ sysvinit-2.86.ds1/debian/initscripts/etc/init.d/checkroot.sh	Fri Dec  3 08:35:37 2010
@@ -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.