diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-25 09:34:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 09:34:17 +0000 |
| commit | 66967ec7521d065f605795d64ddbbbd4fcd448c3 (patch) | |
| tree | c99735a34270f1ca9da366eafcc5b5fce16c7f7f /nixos/modules/installer | |
| parent | fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9 (diff) | |
| parent | db9b5f5525225acf20f0f030e95532d192b3baac (diff) | |
| download | nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.gz nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.bz2 nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.lz nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.xz nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.zst nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.zip | |
Merge pull request #67232 from ck3d/container-useHostResolvConf
machinectl compliant NixOS installation
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 8685cb345e1e..be3b5c0687a6 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -132,8 +132,9 @@ if [[ -z $noBootLoader ]]; then echo "installing the boot loader..." # Grub needs an mtab. ln -sfn /proc/mounts $mountPoint/etc/mtab - NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot + export NIXOS_INSTALL_BOOTLOADER=1 fi +nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot # Ask the user to set a root password, but only if the passwd command # exists (i.e. when mutable user accounts are enabled). |