diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-05-02 05:02:09 -0500 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-08-28 13:35:34 -0700 |
| commit | 4f832b521729daf54f83d0b5c6ff008d5311a81a (patch) | |
| tree | 23e6c38ca8497d9880d5bb51d8e4cefe643cde22 /nixos/modules/system | |
| parent | 1851efa1a7143b3f1fad4c4f1e046ff418f69d0e (diff) | |
| download | nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.tar nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.tar.gz nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.tar.bz2 nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.tar.lz nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.tar.xz nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.tar.zst nixlib-4f832b521729daf54f83d0b5c6ff008d5311a81a.zip | |
Revert "grub: Allow setting the boot root explicitly"
This reverts commit e4630c1d41d513eb709bddb39043da84442235a7.
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 11 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 0cc060db8f90..a3b09223cbb8 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -25,7 +25,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default devices explicitBootRoot; + default devices; path = (makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils ]) + ":" + (makeSearchPath "sbin" [ @@ -209,15 +209,6 @@ in ''; }; - explicitBootRoot = mkOption { - default = ""; - type = types.str; - description = '' - The relative path of /boot within the parent volume. Leave empty - if /boot is not a btrfs subvolume. - ''; - }; - }; }; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index c3aa8518b8bb..a83733db63b0 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -39,7 +39,6 @@ my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; my $timeout = int(get("timeout")); my $defaultEntry = int(get("default")); -my $explicitBootRoot = get("explicitBootRoot"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -62,10 +61,6 @@ if (stat("/")->dev != stat("/boot")->dev) { $copyKernels = 1; } -if ($explicitBootRoot ne "") { - $bootRoot = $explicitBootRoot; -} - # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; |