public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "please: command not found" in switch-to-configuration

Browse Source
This commit is contained in:
Eelco Dolstra 2012-07-30 15:19:30 -04:00
parent 2678ff3726
commit 6576d81ff1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/activation/top-level.nix
View File

@ -151,7 +151,7 @@ let
config.boot.kernelParams ++ config.boot.extraKernelParams; config.boot.kernelParams ++ config.boot.extraKernelParams;
installBootLoader = installBootLoader =
config.system.build.installBootLoader config.system.build.installBootLoader
or "echo 'Warning: don't know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; or "echo \"Warning: don't know how to make this configuration bootable; please enable a boot loader.\" 1>&2; true";
activationScript = config.system.activationScripts.script; activationScript = config.system.activationScripts.script;
nixosVersion = config.system.nixosVersion; nixosVersion = config.system.nixosVersion;
@ -159,11 +159,11 @@ let
# Pass the names of all Upstart tasks to the activation script. # Pass the names of all Upstart tasks to the activation script.
tasks = attrValues (mapAttrs (n: v: if v.task then ["[${v.name}]=1"] else []) config.jobs); tasks = attrValues (mapAttrs (n: v: if v.task then ["[${v.name}]=1"] else []) config.jobs);
# Pass the names of all Upstart jobs that shouldn't be restarted # Pass the names of all Upstart jobs that shouldn't be restarted
# to the activation script. # to the activation script.
noRestartIfChanged = attrValues (mapAttrs (n: v: if v.restartIfChanged then [] else ["[${v.name}]=1"]) config.jobs); noRestartIfChanged = attrValues (mapAttrs (n: v: if v.restartIfChanged then [] else ["[${v.name}]=1"]) config.jobs);
# Most of these are needed by grub-install. # Most of these are needed by grub-install.
path = path =
[ pkgs.coreutils [ pkgs.coreutils