From 89a5be1f9b28a9309676d99383a51add3ef72266 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 5 Jul 2015 23:53:01 +0200 Subject: Moved mbr device definitions to section for hardware-dependent expressions --- bragi-hw.nix | 1 + bragi.nix | 1 - vali-hw.nix | 1 + vali.nix | 2 -- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bragi-hw.nix b/bragi-hw.nix index 6a14ff09..ab424091 100644 --- a/bragi-hw.nix +++ b/bragi-hw.nix @@ -8,6 +8,7 @@ boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "usb_storage" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + boot.loader.grub.device = "/dev/disk/by-id/ata-Crucial_CT256M550SSD3_15010E5F81A6"; fileSystems."/" = { device = "/dev/disk/by-uuid/15fc072d-5fdf-4ec7-b029-50d09b4dc5ea"; diff --git a/bragi.nix b/bragi.nix index 145493a1..99e67e3c 100644 --- a/bragi.nix +++ b/bragi.nix @@ -13,7 +13,6 @@ in { boot.loader.grub.enable = true; boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/disk/by-id/ata-Crucial_CT256M550SSD3_15010E5F81A6"; boot.loader.grub.extraConfig = "serial; terminal_output.serial"; boot.kernelParams = [ "console=ttyS0,115200" diff --git a/vali-hw.nix b/vali-hw.nix index 700c82ee..eb387a41 100644 --- a/vali-hw.nix +++ b/vali-hw.nix @@ -11,6 +11,7 @@ boot.initrd.availableKernelModules = [ "ehci_pci" "ata_piix" "pata_marvell" "xhci_hcd" "firewire_ohci" "usb_storage" "usbhid" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.loader.grub.device = "/dev/disk/by-id/ata-ST3500630AS_9QG2V5B9"; fileSystems."/" = { device = "/dev/disk/by-uuid/2343160f-7abc-4233-8dac-3b42ad0fdadb"; diff --git a/vali.nix b/vali.nix index 389acfb1..8af5c1da 100644 --- a/vali.nix +++ b/vali.nix @@ -15,8 +15,6 @@ rec { # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; - # Define on which hard drive you want to install Grub. - boot.loader.grub.device = "/dev/disk/by-id/ata-ST3500630AS_9QG2V5B9"; boot.loader.grub.extraEntriesBeforeNixOS = true; boot.loader.grub.extraEntries = '' -- cgit v1.2.3