about summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorWill Fancher <elvishjerricco@gmail.com>2022-04-17 18:30:44 -0400
committerWill Fancher <elvishjerricco@gmail.com>2022-04-17 18:31:35 -0400
commitf3f2e55e594f6b1e6bd75d41125fea13d3889896 (patch)
tree79f1bad670ad6e4fe5ab0a87e4c6e793e184c4f4 /nixos/modules/installer
parent9ee5d61a16c1a00ae4864a632aba2c297faa81c3 (diff)
downloadnixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.tar
nixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.tar.gz
nixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.tar.bz2
nixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.tar.lz
nixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.tar.xz
nixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.tar.zst
nixlib-f3f2e55e594f6b1e6bd75d41125fea13d3889896.zip
nixos: Fix channel copying in installer tests with systemd stage 1
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r--nixos/modules/installer/cd-dvd/channel.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 92164d65e533..2f91cd39881d 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -39,7 +39,8 @@ in
         echo "unpacking the NixOS/Nixpkgs sources..."
         mkdir -p /nix/var/nix/profiles/per-user/root
         ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
-          -i ${channelSources} --quiet --option build-use-substitutes false
+          -i ${channelSources} --quiet --option build-use-substitutes false \
+          ${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
         mkdir -m 0700 -p /root/.nix-defexpr
         ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
         mkdir -m 0755 -p /var/lib/nixos