[SCM] live-helper branch, master, updated. 1.0.5-2-62-gcb6ff00

Daniel Baumann daniel at debian.org
Thu Nov 12 05:43:44 UTC 2009


The following commit has been merged in the master branch:
commit cb6ff0060d0df48007cb88b908a9b638db24f816
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date:   Thu Nov 12 06:42:04 2009 +0100

    Omit numbering for first kernel and initrd installed into binary.

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

-- 
live-helper



More information about the debian-live-changes mailing list