Author: eelco Date: 2010-07-05 09:28:22 +0000 (Mon, 05 Jul 2010) New Revision: 22473
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22473&view=rev Modified: nixos/branches/boot-order/modules/tasks/filesystems.nix Log: * Ensure that the ?\226?\128?\152mount-failed?\226?\128?\153 and ?\226?\128?\152emergency-shell?\226?\128?\153 tasks don't get started by ?\226?\128?\152switch-to-configuration.sh?\226?\128?\153. Changes: Modified: nixos/branches/boot-order/modules/tasks/filesystems.nix =================================================================== --- nixos/branches/boot-order/modules/tasks/filesystems.nix 2010-07-05 08:28:15 UTC (rev 22472) +++ nixos/branches/boot-order/modules/tasks/filesystems.nix 2010-07-05 09:28:22 UTC (rev 22473) @@ -177,6 +177,7 @@ startOn = "mount-failed"; script = '' + [ -n "$MOUNTPOINT" ] || exit 0 start --no-wait emergency-shell \ DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT" ''; @@ -191,6 +192,8 @@ script = '' + [ -n "$MOUNTPOINT" ] || exit 0 + exec < /dev/console > /dev/console 2>&1 cat <<EOF _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
