From 40cc1b82291416060957593e25abc93b5a88d728 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Thu, 24 Mar 2011 22:42:07 +0100
Subject: Do not number the default kernel / initrd files.

---
 debian/changelog              |  7 +++++++
 scripts/build/lb_binary_burg  | 26 ++++++++++++++++++++++++++
 scripts/build/lb_binary_grub2 | 26 ++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 23a1ffe..281e73d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-build (2.0.12+burg-2) unstable; urgency=low
+
+  * Added burg support.
+  * Do not number the default kernel / initrd files.
+
+ -- Andreas Loibl <andreas@andreas-loibl.de>  Thu, 24 Mar 2011 22:41:44 +0100
+
 live-build (2.0.12-2) unstable; urgency=low
 
   * Adding preinst script to remove
diff --git a/scripts/build/lb_binary_burg b/scripts/build/lb_binary_burg
index 9afca88..e2eea70 100755
--- a/scripts/build/lb_binary_burg
+++ b/scripts/build/lb_binary_burg
@@ -67,6 +67,32 @@ Burg_live_entry ()
 	INITRD="${3}"
 	APPEND="${4}"
 
+        case "${LB_BINARY_IMAGES}" in
+                iso*|usb*)
+                        if [ "${LABEL}" = "live" ]
+                        then
+                                # Do not number the default kernel / initrd files.
+                                _NUMBER=""
+                        else
+                                # Use order of flavours in LB_LINUX_FLAVOURS for numbering.
+                                _NUMBER="$(echo ${LB_LINUX_FLAVOURS} | awk -v FLAVOUR="${FLAVOUR}" 'BEGIN{RS=" "} {if($1 == FLAVOUR) print NR}')"
+                        fi
+
+                        if [ -e ${KERNEL_PATH}/${KERNEL} ]
+                        then
+                                mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${_NUMBER}
+                        fi
+
+                        if [ -e ${KERNEL_PATH}/${INITRD} ]
+                        then
+                                mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${_NUMBER}.img
+                        fi
+
+                        KERNEL=vmlinuz${_NUMBER}
+                        INITRD=initrd${_NUMBER}.img
+                ;;
+        esac
+
 	LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
 	LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}"
 	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index 6ad8c3c..fdfca0d 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -67,6 +67,32 @@ Grub_live_entry ()
 	INITRD="${3}"
 	APPEND="${4}"
 
+        case "${LB_BINARY_IMAGES}" in
+                iso*|usb*)
+                        if [ "${LABEL}" = "live" ]
+                        then
+                                # Do not number the default kernel / initrd files.
+                                _NUMBER=""
+                        else
+                                # Use order of flavours in LB_LINUX_FLAVOURS for numbering.
+                                _NUMBER="$(echo ${LB_LINUX_FLAVOURS} | awk -v FLAVOUR="${FLAVOUR}" 'BEGIN{RS=" "} {if($1 == FLAVOUR) print NR}')"
+                        fi
+
+                        if [ -e ${KERNEL_PATH}/${KERNEL} ]
+                        then
+                                mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${_NUMBER}
+                        fi
+
+                        if [ -e ${KERNEL_PATH}/${INITRD} ]
+                        then
+                                mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${_NUMBER}.img
+                        fi
+
+                        KERNEL=vmlinuz${_NUMBER}
+                        INITRD=initrd${_NUMBER}.img
+                ;;
+        esac
+
 	LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
 	LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}"
 	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
-- 
cgit v1.0