alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #136 from MarcWeber/submit/grubDevice

Browse source 
s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings
This commit is contained in:
Phreedom 2013-05-05 07:41:22 -07:00
parent d6df27277b 9bf073b58b
commit 6c988a593a
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 = {
grubDevice = "/dev/sda";
loader.grub.device = "/dev/sda";
copyKernels = true;
bootMount = "(hd0,0)";
};

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

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

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

@ -2,7 +2,7 @@
{
boot = {
grubDevice = "/dev/sda";
loader.grub.device = "/dev/sda";
initrd = {
kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
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
<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
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";
# undefined the obsolete name of the previous option.
boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
nesting.children = mkOverrideTemplate 0 {} [];
nesting.clone = mkOverrideTemplate 0 {} [];
}