dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos: use nixosLabel in more places

Browse Source
This commit is contained in:
Jan Malakhovski 2017-04-01 00:00:00 +00:00
parent 8200e08b0b
commit 09512be289
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -46,21 +46,21 @@ let
# A variant to boot with 'nomodeset' # A variant to boot with 'nomodeset'
LABEL boot-nomodeset LABEL boot-nomodeset
MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (nomodeset) MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel} (nomodeset)
LINUX /boot/${config.system.boot.loader.kernelFile} LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
INITRD /boot/${config.system.boot.loader.initrdFile} INITRD /boot/${config.system.boot.loader.initrdFile}
# A variant to boot with 'copytoram' # A variant to boot with 'copytoram'
LABEL boot-copytoram LABEL boot-copytoram
MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (copytoram) MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel} (copytoram)
LINUX /boot/${config.system.boot.loader.kernelFile} LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
INITRD /boot/${config.system.boot.loader.initrdFile} INITRD /boot/${config.system.boot.loader.initrdFile}
# A variant to boot with verbose logging to the console # A variant to boot with verbose logging to the console
LABEL boot-nomodeset LABEL boot-nomodeset
MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug) MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel} (debug)
LINUX /boot/${config.system.boot.loader.kernelFile} LINUX /boot/${config.system.boot.loader.kernelFile}
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
INITRD /boot/${config.system.boot.loader.initrdFile} INITRD /boot/${config.system.boot.loader.initrdFile}
@ -82,7 +82,7 @@ let
mkdir -p $out/loader/entries mkdir -p $out/loader/entries
cat << EOF > $out/loader/entries/nixos-iso.conf cat << EOF > $out/loader/entries/nixos-iso.conf
title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} title NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel}
linux /boot/${config.system.boot.loader.kernelFile} linux /boot/${config.system.boot.loader.kernelFile}
initrd /boot/${config.system.boot.loader.initrdFile} initrd /boot/${config.system.boot.loader.initrdFile}
options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
@ -90,7 +90,7 @@ let
# A variant to boot with 'nomodeset' # A variant to boot with 'nomodeset'
cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf
title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} title NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel}
version nomodeset version nomodeset
linux /boot/${config.system.boot.loader.kernelFile} linux /boot/${config.system.boot.loader.kernelFile}
initrd /boot/${config.system.boot.loader.initrdFile} initrd /boot/${config.system.boot.loader.initrdFile}
@ -99,7 +99,7 @@ let
# A variant to boot with 'copytoram' # A variant to boot with 'copytoram'
cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf
title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} title NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel}
version copytoram version copytoram
linux /boot/${config.system.boot.loader.kernelFile} linux /boot/${config.system.boot.loader.kernelFile}
initrd /boot/${config.system.boot.loader.initrdFile} initrd /boot/${config.system.boot.loader.initrdFile}
@ -108,7 +108,7 @@ let
# A variant to boot with verbose logging to the console # A variant to boot with verbose logging to the console
cat << EOF > $out/loader/entries/nixos-iso-debug.conf cat << EOF > $out/loader/entries/nixos-iso-debug.conf
title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug) title NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel} (debug)
linux /boot/${config.system.boot.loader.kernelFile} linux /boot/${config.system.boot.loader.kernelFile}
initrd /boot/${config.system.boot.loader.initrdFile} initrd /boot/${config.system.boot.loader.initrdFile}
options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
@ -361,7 +361,7 @@ in
{ source = config.isoImage.splashImage; { source = config.isoImage.splashImage;
target = "/isolinux/background.png"; target = "/isolinux/background.png";
} }
{ source = pkgs.writeText "version" config.system.nixosVersion; { source = pkgs.writeText "version" config.system.nixosLabel;
target = "/version.txt"; target = "/version.txt";
} }
] ++ optionals config.isoImage.makeEfiBootable [ ] ++ optionals config.isoImage.makeEfiBootable [

2
nixos/modules/installer/cd-dvd/system-tarball.nix
View File

@ -8,7 +8,7 @@ with lib;
let let
versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion; versionFile = pkgs.writeText "nixos-label" config.system.nixosLabel;
in in