Browse Source

* Don't try to run fsck on ISO-9660/UDF filesystems.

svn path=/nixos/branches/modular-nixos/; revision=15963
nsd-state-dir
Eelco Dolstra 13 years ago
parent
commit
048e03377f
  1. 2
      default.nix
  2. 7
      modules/system/boot/stage-1-init.sh

2
default.nix

@ -10,6 +10,8 @@ let
in
{
inherit config;
system = config.system.build.system;
# The following are used by nixos-rebuild.

7
modules/system/boot/stage-1-init.sh

@ -141,13 +141,18 @@ checkFS() {
# Only check block devices.
if ! test -b "$device"; then return 0; fi
eval $(fstype "$device")
# Don't check ROM filesystems.
if test "$FSTYPE" = iso9660 -o "$FSTYPE" = udf; then return 0; fi
# Don't run `fsck' if the machine is on battery power. !!! Is
# this a good idea?
if ! onACPower; then
echo "on battery power, so no \`fsck' will be performed on \`$device'"
return 0
fi
FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
fsckResult=$?

Loading…
Cancel
Save