diff options
| author | Colin Watson <cjwatson@canonical.com> | 2011-06-08 10:07:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-08 10:07:26 +0200 |
| commit | 6bcb29a25c1bddf150ed91919b940ace3dba8289 (patch) | |
| tree | b9f082683d1a1cf93ddea526ee4086ef959aaf47 /scripts/build/lb_binary_yaboot | |
| parent | 8b05781dbcb27847b5f3afb432d48f8486d79b57 (diff) | |
| download | vyos-live-build-6bcb29a25c1bddf150ed91919b940ace3dba8289.tar.gz vyos-live-build-6bcb29a25c1bddf150ed91919b940ace3dba8289.zip | |
Make --initramfs none work more consistently (Closes: #627887).
Diffstat (limited to 'scripts/build/lb_binary_yaboot')
| -rwxr-xr-x | scripts/build/lb_binary_yaboot | 10 |
1 files changed, 9 insertions, 1 deletions
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" |