diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 13:33:13 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 13:33:13 +0100 |
| commit | c7142c1aa3ea15909656d767046de188d1e81ac9 (patch) | |
| tree | 174b3a9a4fda3fd6340be4fd33f2e969d0b6af79 /nixos/modules/system/boot/loader/grub | |
| parent | 6eb40148742de9010f2f7f6eec26df15f54e9afc (diff) | |
| parent | e01e92f12f5e768e5bd5ef84a969b978fb501186 (diff) | |
| download | nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.tar nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.tar.gz nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.tar.bz2 nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.tar.lz nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.tar.xz nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.tar.zst nixlib-c7142c1aa3ea15909656d767046de188d1e81ac9.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/system/boot/loader/grub')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index ab32e112936c..e86df4e74c9f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -500,7 +500,7 @@ in imports = - [ (mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ]) + [ (mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ] "") (mkRenamedOptionModule [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ]) (mkRenamedOptionModule [ "boot" "extraGrubEntries" ] [ "boot" "loader" "grub" "extraEntries" ]) (mkRenamedOptionModule [ "boot" "extraGrubEntriesBeforeNixos" ] [ "boot" "loader" "grub" "extraEntriesBeforeNixOS" ]) |