[SCM] live-build branch, debian, updated. debian/2.0_a28-1-12-g43666a8

Daniel Baumann daniel at debian.org
Thu Sep 16 19:25:30 UTC 2010


The following commit has been merged in the debian branch:
commit 57b585272f4d492cb7f5875debb596018c3f3003
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 16 16:18:08 2010 +0200

    Correcting to narrow pattern for counting kernel images (Closes: #581252).

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index a613381..c5f53bf 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -95,7 +95,7 @@ Syslinux_live_entry ()
 
 	case "${LB_BINARY_IMAGES}" in
 		iso*|usb*)
-			NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
+			NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz-' | wc -l)"
 			NUMBER="$((${NUMBER} +1))"
 
 			# Do not add numbering to filenames if first kernel/initrd

-- 
live-build



More information about the debian-live-changes mailing list