diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-01-09 20:52:08 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-01-09 20:52:08 +0300 |
| commit | c03fe792656b506b40e18d9c070d0bad8f7f1c3e (patch) | |
| tree | fa3b8e6d5bf875f30a5629f72d76a87e0d67944a /nixos/modules/system/boot | |
| parent | 84631f32276a86a1748effc7399c8c0ea97500ba (diff) | |
| parent | 119c8f91e7f17d2cb95f42985816820600c389cf (diff) | |
| download | nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.gz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.bz2 nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.lz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.xz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.zst nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.zip | |
Merge pull request #10996 from oxij/nixos-label
nixos: introduce system.nixosLabel support
Diffstat (limited to 'nixos/modules/system/boot')
| -rw-r--r-- | nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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)" |