public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44108 from bennofs/gen-config-extlinux

Browse Source 
nixos-generate-config: detect extlinux bootloader
This commit is contained in:
Silvan Mosberger 2018-08-05 22:59:46 +02:00 committed by GitHub
commit 47b3cdf9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -536,6 +536,13 @@ if ($showHardwareConfig) {
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
EOF
} elsif (-e "/boot/extlinux") {
$bootLoaderConfig = <<EOF;
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
boot.loader.grub.enable = false;
# Enables the generation of /boot/extlinux/extlinux.conf
boot.loader.generic-extlinux-compatible.enable = true;
EOF EOF
} elsif ($virt ne "systemd-nspawn") { } elsif ($virt ne "systemd-nspawn") {
$bootLoaderConfig = <<EOF; $bootLoaderConfig = <<EOF;