summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorCody A.W. Somerville <cody.somerville@canonical.com>2009-11-12 06:42:04 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:48 +0100
commitf8b187c7a99eb6a180dccc127bd89f77077b1747 (patch)
tree0e5b16e23d3393355eced4138118b4db63fc6d6c /helpers
parentdbcae19129fb310cef3330d9e8342602e2845589 (diff)
downloadlive-build-f8b187c7a99eb6a180dccc127bd89f77077b1747.zip
live-build-f8b187c7a99eb6a180dccc127bd89f77077b1747.tar.gz
Omit numbering for first kernel and initrd installed into binary.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_syslinux6
1 files changed, 6 insertions, 0 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 96ac452..73a8a30 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -94,6 +94,12 @@ Syslinux_live_entry ()
NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
NUMBER="$((${NUMBER} +1))"
+ # Do not add numbering to filenames if first kernel/initrd
+ if [ "${NUMBER}" = "1" ]
+ then
+ NUMBER=""
+ fi
+
# Note: ISOLINUX will not find the kernel if the name ends in ".img".
mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER}
mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img