diff options
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/activation/top-level.nix | 6 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 81088a56fb12..1c242c88863d 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -67,7 +67,7 @@ let echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version - echo -n "$nixosVersion" > $out/nixos-version + echo -n "$nixosLabel" > $out/nixos-version echo -n "$system" > $out/system mkdir $out/fine-tune @@ -101,7 +101,7 @@ let if [] == failed then pkgs.stdenv.mkDerivation { name = let hn = config.networking.hostName; nn = if (hn != "") then hn else "unnamed"; - in "nixos-system-${nn}-${config.system.nixosVersion}"; + in "nixos-system-${nn}-${config.system.nixosLabel}"; preferLocalBuild = true; allowSubstitutes = false; buildCommand = systemBuilder; @@ -115,7 +115,7 @@ let config.system.build.installBootLoader or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; activationScript = config.system.activationScripts.script; - nixosVersion = config.system.nixosVersion; + nixosLabel = config.system.nixosLabel; configurationName = config.boot.loader.grub.configurationName; diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index b9a42b2a196d..78a8e8fd658c 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -83,7 +83,7 @@ addEntry() { timestampEpoch=$(stat -L -c '%Z' $path) timestamp=$(date "+%Y-%m-%d %H:%M" -d @$timestampEpoch) - nixosVersion="$(cat $path/nixos-version)" + nixosLabel="$(cat $path/nixos-version)" extraParams="$(cat $path/kernel-params)" echo @@ -91,7 +91,7 @@ addEntry() { if [ "$tag" = "default" ]; then echo " MENU LABEL NixOS - Default" else - echo " MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosVersion)" + echo " MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosLabel)" fi echo " LINUX ../nixos/$(basename $kernel)" echo " INITRD ../nixos/$(basename $initrd)" |