diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-24 13:27:28 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-24 13:27:28 +0000 |
| commit | 3f10cf70f6f26df6d3db27dd156fb6530448eebe (patch) | |
| tree | b7d859db2c3b388cc0509821fa2018ecfe066cb3 /modules | |
| parent | 392275f1856f14b02f113a1116671ac0b14069e8 (diff) | |
| download | nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.tar nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.tar.gz nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.tar.bz2 nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.tar.lz nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.tar.xz nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.tar.zst nixlib-3f10cf70f6f26df6d3db27dd156fb6530448eebe.zip | |
* Regression test for the build hook mechanism.
svn path=/nixos/trunk/; revision=23395
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/activation/top-level.nix | 3 | ||||
| -rw-r--r-- | modules/system/boot/stage-1.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix index 262a3bb9ae7a..cb3c4e8941dc 100644 --- a/modules/system/activation/top-level.nix +++ b/modules/system/activation/top-level.nix @@ -99,8 +99,7 @@ let let kernelPath = "${config.boot.kernelPackages.kernel}/" + "${config.system.boot.loader.kernelFile}"; - in - '' + in '' ensureDir $out if [ ! -f ${kernelPath} ]; then diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index 9a324124a9d7..7f8287e7e4ba 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -329,5 +329,6 @@ in { system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk; + system.build.extraUtils = extraUtils; } |