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_grub | |
| 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_grub')
| -rwxr-xr-x | scripts/build/lb_binary_grub | 10 |
1 files changed, 9 insertions, 1 deletions
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" |