From 6bcb29a25c1bddf150ed91919b940ace3dba8289 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 8 Jun 2011 10:07:26 +0200
Subject: Make --initramfs none work more consistently (Closes: #627887).

---
 scripts/build/lb_binary_grub | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'scripts/build/lb_binary_grub')

diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index ee14bd900..39aca30d3 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -68,7 +68,7 @@ Grub_live_entry ()
 	APPEND="${4}"
 
 	LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
-	LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}"
+	LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} ${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}"
 	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
 }
 
@@ -125,6 +125,10 @@ case "${LB_INITRAMFS}" in
 	live-boot)
 		INITFS="live"
 		;;
+
+	*)
+		INITFS=""
+		;;
 esac
 
 # Setting destination directory
@@ -138,6 +142,10 @@ case "${LB_BINARY_IMAGES}" in
 			live-boot)
 				DESTDIR_LIVE="binary/live"
 				;;
+
+			*)
+				DESTDIR_LIVE="binary/boot"
+				;;
 		esac
 
 		DESTDIR_INSTALL="binary/install"
-- 
cgit v1.2.3