forked from mirrors/nixpkgs
* Don't try to run fsck on ISO-9660/UDF filesystems.
svn path=/nixos/branches/modular-nixos/; revision=15963
This commit is contained in:
parent
ff58b5dede
commit
048e03377f
|
@ -10,6 +10,8 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
inherit config;
|
||||||
|
|
||||||
system = config.system.build.system;
|
system = config.system.build.system;
|
||||||
|
|
||||||
# The following are used by nixos-rebuild.
|
# The following are used by nixos-rebuild.
|
||||||
|
|
|
@ -141,13 +141,18 @@ checkFS() {
|
||||||
# Only check block devices.
|
# Only check block devices.
|
||||||
if ! test -b "$device"; then return 0; fi
|
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
|
# Don't run `fsck' if the machine is on battery power. !!! Is
|
||||||
# this a good idea?
|
# this a good idea?
|
||||||
if ! onACPower; then
|
if ! onACPower; then
|
||||||
echo "on battery power, so no \`fsck' will be performed on \`$device'"
|
echo "on battery power, so no \`fsck' will be performed on \`$device'"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
|
FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
|
||||||
fsckResult=$?
|
fsckResult=$?
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue