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

Merge branch 'nixos-subdir' 

Conflicts:
	nixos/modules/system/boot/loader/grub/grub.nix
This commit is contained in:
Luca Bruno 2015-06-13 15:18:12 +02:00
parent ea3382bb69 c3e832b323
commit 033605e87f
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -41,6 +41,7 @@ let
grubEfi = f grubEfi; grubEfi = f grubEfi;
grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
bootPath = args.path; bootPath = args.path;
storePath = config.boot.loader.grub.storePath;
bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId;
inherit efiSysMountPoint; inherit efiSysMountPoint;
inherit (args) devices; inherit (args) devices;
@ -180,6 +181,15 @@ in
''; '';
}; };
storePath = mkOption {
default = "/nix/store";
type = types.str;
description = ''
Path to the Nix store when looking for kernels at boot.
Only makes sense when copyKernels is false.
'';
};
extraPrepareConfig = mkOption { extraPrepareConfig = mkOption {
default = ""; default = "";
type = types.lines; type = types.lines;

3
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -55,6 +55,7 @@ my $fsIdentifier = get("fsIdentifier");
my $grubEfi = get("grubEfi"); my $grubEfi = get("grubEfi");
my $grubTargetEfi = get("grubTargetEfi"); my $grubTargetEfi = get("grubTargetEfi");
my $bootPath = get("bootPath"); my $bootPath = get("bootPath");
my $storePath = get("storePath");
my $canTouchEfiVariables = get("canTouchEfiVariables"); my $canTouchEfiVariables = get("canTouchEfiVariables");
my $efiSysMountPoint = get("efiSysMountPoint"); my $efiSysMountPoint = get("efiSysMountPoint");
my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeEfi = get("gfxmodeEfi");
@ -213,7 +214,7 @@ sub GrubFs {
my $grubBoot = GrubFs($bootPath); my $grubBoot = GrubFs($bootPath);
my $grubStore; my $grubStore;
if ($copyKernels == 0) { if ($copyKernels == 0) {
$grubStore = GrubFs("/nix/store"); $grubStore = GrubFs($storePath);
} }
# Generate the header. # Generate the header.

2
nixos/modules/system/boot/stage-1-init.sh
View File

@ -317,7 +317,7 @@ mountFS() {
# Try to find and mount the root device. # Try to find and mount the root device.
mkdir /mnt-root mkdir -p $targetRoot
exec 3< @fsInfo@ exec 3< @fsInfo@