From 6bcb29a25c1bddf150ed91919b940ace3dba8289 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 8 Jun 2011 10:07:26 +0200 Subject: Make --initramfs none work more consistently (Closes: #627887). --- scripts/build/lb_binary_yaboot | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'scripts/build/lb_binary_yaboot') diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index ee2452bb8..4613b8a19 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -72,7 +72,7 @@ Yaboot_live_entry () LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\tappend=\"${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" } @@ -132,6 +132,10 @@ case "${LB_INITRAMFS}" in live-boot) INITFS="live" ;; + + *) + INITFS="" + ;; esac # Setting destination directory @@ -145,6 +149,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