diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-27 19:58:23 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-27 19:58:23 +0100 |
commit | cc2eeef4abfaf484363d43d6bcce510f0f16dc1d (patch) | |
tree | e4fe86b08f63348ce89c9ed204ab46d8e8737b8f /nixos/lib | |
parent | 8c6f9223d02c5123cbd364d6d56caca3c81416f0 (diff) | |
download | nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.tar nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.tar.gz nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.tar.bz2 nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.tar.lz nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.tar.xz nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.tar.zst nixlib-cc2eeef4abfaf484363d43d6bcce510f0f16dc1d.zip |
Fix installing the Nixpkgs channel on the installation media
And test that it got installed correctly.
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/make-disk-image.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 4da863469032..ebfb09db7b7e 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -181,7 +181,8 @@ let format' = format; in let nix-store --load-db < ${closureInfo}/registration echo "running nixos-install..." - nixos-install --root $root --no-bootloader --no-root-passwd --closure ${config.system.build.toplevel} --substituters "" + nixos-install --root $root --no-bootloader --no-root-passwd \ + --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" echo "copying staging root to image..." cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / |