diff --git a/doc/config-examples/closed-install-configuration.nix b/doc/config-examples/closed-install-configuration.nix index fed557ddd0d..0cebacdb0cc 100644 --- a/doc/config-examples/closed-install-configuration.nix +++ b/doc/config-examples/closed-install-configuration.nix @@ -1,6 +1,6 @@ { boot = { - grubDevice = "/dev/sda"; + loader.grub.device = "/dev/sda"; copyKernels = true; bootMount = "(hd0,0)"; }; diff --git a/doc/config-examples/svn-server.nix b/doc/config-examples/svn-server.nix index 68a3374987f..e727007117b 100644 --- a/doc/config-examples/svn-server.nix +++ b/doc/config-examples/svn-server.nix @@ -1,6 +1,6 @@ { boot = { - grubDevice = "/dev/sda"; + loader.grub.device = "/dev/sda"; }; fileSystems = [ diff --git a/doc/config-examples/x86_64-usbstick.nix b/doc/config-examples/x86_64-usbstick.nix index b76a07b0d57..492b7a841a1 100644 --- a/doc/config-examples/x86_64-usbstick.nix +++ b/doc/config-examples/x86_64-usbstick.nix @@ -2,7 +2,7 @@ { boot = { - grubDevice = "/dev/sda"; + loader.grub.device = "/dev/sda"; initrd = { kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"]; enableSplashScreen = false; diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml index b040b4ff164..7761fc97245 100644 --- a/doc/manual/installation.xml +++ b/doc/manual/installation.xml @@ -118,7 +118,7 @@ $ nixos-option --install You need to specify a root file system in and the target device for the Grub boot - loader in . See + loader in . See for a list of the available configuration options. diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix index d28183d2dc4..f15809e4d8b 100644 --- a/modules/system/activation/no-clone.nix +++ b/modules/system/activation/no-clone.nix @@ -6,8 +6,6 @@ with pkgs.lib; { boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev"; - # undefined the obsolete name of the previous option. - boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef; nesting.children = mkOverrideTemplate 0 {} []; nesting.clone = mkOverrideTemplate 0 {} []; }