diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-04-30 13:18:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-30 13:18:57 -0700 |
| commit | 78f6f779627c89823d8402aac658418ef188be1c (patch) | |
| tree | c6bfbb7f110660fdc211044179cd216cfdba716f /nixos/modules/installer | |
| parent | 405ce5693de092913107c8cfb33b328cee13addb (diff) | |
| parent | f3f2e55e594f6b1e6bd75d41125fea13d3889896 (diff) | |
| download | nixlib-78f6f779627c89823d8402aac658418ef188be1c.tar nixlib-78f6f779627c89823d8402aac658418ef188be1c.tar.gz nixlib-78f6f779627c89823d8402aac658418ef188be1c.tar.bz2 nixlib-78f6f779627c89823d8402aac658418ef188be1c.tar.lz nixlib-78f6f779627c89823d8402aac658418ef188be1c.tar.xz nixlib-78f6f779627c89823d8402aac658418ef188be1c.tar.zst nixlib-78f6f779627c89823d8402aac658418ef188be1c.zip | |
Merge pull request #169113 from ElvishJerricco/systemd-stage-1-installer-tests
nixos: Installer tests for systemd stage 1
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 3 |
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 |