* Ensure that the ‘mount-failed’ and ‘emergency-shell’ tasks don't get
started by ‘switch-to-configuration.sh’. svn path=/nixos/branches/boot-order/; revision=22473
This commit is contained in:
parent
1f97de224f
commit
4225181fa1
@ -177,6 +177,7 @@ in
|
|||||||
startOn = "mount-failed";
|
startOn = "mount-failed";
|
||||||
script =
|
script =
|
||||||
''
|
''
|
||||||
|
[ -n "$MOUNTPOINT" ] || exit 0
|
||||||
start --no-wait emergency-shell \
|
start --no-wait emergency-shell \
|
||||||
DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
|
DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
|
||||||
'';
|
'';
|
||||||
@ -191,6 +192,8 @@ in
|
|||||||
|
|
||||||
script =
|
script =
|
||||||
''
|
''
|
||||||
|
[ -n "$MOUNTPOINT" ] || exit 0
|
||||||
|
|
||||||
exec < /dev/console > /dev/console 2>&1
|
exec < /dev/console > /dev/console 2>&1
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
Loading…
x
Reference in New Issue
Block a user