aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-11-10 22:50:48 +0000
committerRoy Marples <roy@marples.name>2009-11-10 22:50:48 +0000
commitd29daf395299fc97b8e13676bc282800a8bddae8 (patch)
treee28730c6d4189ffcb144fb69b789fa4328e75b3a
parent1d9ce8e9a1ece0fd108b2b50b45bc4a0da0cf3fc (diff)
fsck only checks battery when requested, which is not by default.
This fixes having JFS as the root partition on battery power. For most modern FS's this is a non op, or a very small op by default so it should be fine. Fixes Gentoo #291654.
-rw-r--r--conf.d/fsck5
-rw-r--r--init.d/fsck.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/conf.d/fsck b/conf.d/fsck
index 77fd6582..888dc88a 100644
--- a/conf.d/fsck
+++ b/conf.d/fsck
@@ -13,6 +13,11 @@
#fsck_passno=">1"
#fsck_passno="<2"
+# Most modern fs's don't require a full fsck on boot, but for those that do
+# it may be adivisable to skip this when running on battery.
+# WARNING: Do not turn this off if you have any JFS partitions.
+fsck_on_battery="YES"
+
# fsck_shutdown causes fsck to trigger during shutdown as well as startup.
# The end result of this is that if any periodic non-root filesystem checks are
# scheduled, under normal circumstances the actual check will happen during
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 279e25cb..220b6492 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -73,7 +73,7 @@ start()
if _forcefsck; then
fsck_opts="$fsck_opts -f"
check_extra="(check forced)"
- elif ! _on_ac_power; then
+ elif ! yesno ${fsck_on_battery:-YES} && ! _on_ac_power; then
ewarn "Skipping fsck due to not being on AC power"
return 0
fi