diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-17 21:16:29 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-17 21:16:29 -0400 |
| commit | 2942895d552c30033d902553566a06334264d3e2 (patch) | |
| tree | 36a5ce192cdbae329a75d5909f9ead1ccd25ab38 /nixos/modules/installer | |
| parent | 3367c211c684c7399609de9f1605ca8a7037bcee (diff) | |
| parent | b4954a8f3802ba545933905428a4288622f28294 (diff) | |
| download | nixlib-2942895d552c30033d902553566a06334264d3e2.tar nixlib-2942895d552c30033d902553566a06334264d3e2.tar.gz nixlib-2942895d552c30033d902553566a06334264d3e2.tar.bz2 nixlib-2942895d552c30033d902553566a06334264d3e2.tar.lz nixlib-2942895d552c30033d902553566a06334264d3e2.tar.xz nixlib-2942895d552c30033d902553566a06334264d3e2.tar.zst nixlib-2942895d552c30033d902553566a06334264d3e2.zip | |
Merge branch 'install-bootloader-flag'
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 0c14e51336e5..3b3a7bd27fe8 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -260,7 +260,7 @@ touch $mountPoint/etc/NIXOS # configuration. echo "finalising the installation..." if [ -z "$noBootLoader" ]; then - NIXOS_INSTALL_GRUB=1 chroot $mountPoint \ + NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint \ /nix/var/nix/profiles/system/bin/switch-to-configuration boot fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index e26a9f6cf635..803989789838 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -33,7 +33,11 @@ while [ "$#" -gt 0 ]; do action="$i" ;; --install-grub) - export NIXOS_INSTALL_GRUB=1 + echo "$0: --install-grub deprecated, use --install-bootloader instead" >&2 + export NIXOS_INSTALL_BOOTLOADER=1 + ;; + --install-bootloader) + export NIXOS_INSTALL_BOOTLOADER=1 ;; --no-build-nix) buildNix= |