diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-10-07 20:44:42 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-10-07 20:56:59 +0200 |
| commit | f760f0ef486815bf7d7223773addc35952d270b6 (patch) | |
| tree | 009a1645ea21dafb1a064efe631d35a1ebf77bb9 /nixos/modules/installer | |
| parent | 56e1ea32f4d07d2b02a45be7d1eabef861e3d0d8 (diff) | |
| download | nixlib-f760f0ef486815bf7d7223773addc35952d270b6.tar nixlib-f760f0ef486815bf7d7223773addc35952d270b6.tar.gz nixlib-f760f0ef486815bf7d7223773addc35952d270b6.tar.bz2 nixlib-f760f0ef486815bf7d7223773addc35952d270b6.tar.lz nixlib-f760f0ef486815bf7d7223773addc35952d270b6.tar.xz nixlib-f760f0ef486815bf7d7223773addc35952d270b6.tar.zst nixlib-f760f0ef486815bf7d7223773addc35952d270b6.zip | |
Revert "Merge #67232: machinectl compliant NixOS installation"
This reverts commit 66967ec7521d065f605795d64ddbbbd4fcd448c3, reversing changes made to fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9. Fixes #70442; discussion: https://github.com/NixOS/nixpkgs/pull/70027
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index be3b5c0687a6..8685cb345e1e 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -132,9 +132,8 @@ if [[ -z $noBootLoader ]]; then echo "installing the boot loader..." # Grub needs an mtab. ln -sfn /proc/mounts $mountPoint/etc/mtab - export NIXOS_INSTALL_BOOTLOADER=1 + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot 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). |