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_silo | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts/build/lb_binary_silo') diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index ac2e2d073..5834a0b5b 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -82,7 +82,7 @@ Silo_live_entry () LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\t label=${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\t initrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\t append=\"boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\t append=\"${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" } Silo_install_entry () @@ -117,6 +117,11 @@ case "${LB_INITRAMFS}" in INITFS="live" DESTDIR_LIVE="binary/live" ;; + + *) + INITFS="" + DESTDIR_LIVE="binary/boot" + ;; esac # Creating directory -- cgit v1.2.3