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

s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings

This commit is contained in:
Marc Weber 2013-04-10 23:49:59 +02:00
parent a215600335
commit 9bf073b58b
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config-examples/closed-install-configuration.nix
View File

@ -1,6 +1,6 @@
{ {
boot = { boot = {
grubDevice = "/dev/sda"; loader.grub.device = "/dev/sda";
copyKernels = true; copyKernels = true;
bootMount = "(hd0,0)"; bootMount = "(hd0,0)";
}; };

2
doc/config-examples/svn-server.nix
View File

@ -1,6 +1,6 @@
{ {
boot = { boot = {
grubDevice = "/dev/sda"; loader.grub.device = "/dev/sda";
}; };
fileSystems = [ fileSystems = [

2
doc/config-examples/x86_64-usbstick.nix
View File

@ -2,7 +2,7 @@
{ {
boot = { boot = {
grubDevice = "/dev/sda"; loader.grub.device = "/dev/sda";
initrd = { initrd = {
kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"]; kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
enableSplashScreen = false; enableSplashScreen = false;

2
doc/manual/installation.xml
View File

@ -118,7 +118,7 @@ $ nixos-option --install</screen>
<para>You need to specify a root file system in <para>You need to specify a root file system in
<option>fileSystems</option> and the target device for the Grub boot <option>fileSystems</option> and the target device for the Grub boot
loader in <option>boot.grubDevice</option>. See loader in <option>boot.loader.grub.device</option>. See
<xref linkend="ch-options"/> for a list of the available configuration <xref linkend="ch-options"/> for a list of the available configuration
options.</para> options.</para>

2
modules/system/activation/no-clone.nix
View File

@ -6,8 +6,6 @@ with pkgs.lib;
{ {
boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev"; 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.children = mkOverrideTemplate 0 {} [];
nesting.clone = mkOverrideTemplate 0 {} []; nesting.clone = mkOverrideTemplate 0 {} [];
} }