summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader/generic-extlinux-compatible
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-06-06 14:15:24 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-07-22 16:08:17 +0300
commit6147909f8e80d7fbf15e73f556ee1f6ab4c93289 (patch)
treec25aa784446e15f839cd7f8e13455653e2e76185 /nixos/modules/system/boot/loader/generic-extlinux-compatible
parent1947179036c7473b735f378ea91916a67e73753d (diff)
downloadnixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.tar
nixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.tar.gz
nixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.tar.bz2
nixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.tar.lz
nixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.tar.xz
nixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.tar.zst
nixlib-6147909f8e80d7fbf15e73f556ee1f6ab4c93289.zip
extlinux-conf-builder: Properly copy kernels for the default entry
When calling addEntry inside a subshell, the filesCopied array would
be updated only in the subshell's environment. This would only cause an
issue if no -g flag was passed to the script, causing no kernels
to be copied.
Diffstat (limited to 'nixos/modules/system/boot/loader/generic-extlinux-compatible')
-rw-r--r--nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh3
1 files changed, 2 insertions, 1 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 8f2a496de8b6..9f32dbcce1a3 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
@@ -106,9 +106,10 @@ cat > $tmpFile <<EOF
 DEFAULT nixos-default
 
 TIMEOUT $timeout
-$(addEntry $default default)
 EOF
 
+addEntry $default default >> $tmpFile
+
 # Add up to $numGenerations generations of the system profile to the menu,
 # in reverse (most recent to least recent) order.
 for generation in $(