diff options
| author | jnqnfe <jnqnfe@gmail.com> | 2015-01-14 00:07:48 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-16 16:29:00 +0000 |
| commit | 8a7bc408e5ebc8fdad47ed6a55747d0f0b3be7d1 (patch) | |
| tree | 0423d72458d7a899f7a0fbb28c9e56c163ef9bd9 /scripts/build/binary_grub-legacy | |
| parent | aadf8c4cacecc4664412c6bbc7b8e039e1dd772a (diff) | |
| download | vyos-live-build-8a7bc408e5ebc8fdad47ed6a55747d0f0b3be7d1.tar.gz vyos-live-build-8a7bc408e5ebc8fdad47ed6a55747d0f0b3be7d1.zip | |
grub1: fix consistency
Use the normal appended-params directly in `Grub_live_entry` calls
like the failsafe ones.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_grub-legacy')
| -rwxr-xr-x | scripts/build/binary_grub-legacy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index 39d647a02..1cc1d73b2 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -175,7 +175,7 @@ DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')" DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})" DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')" -Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" +Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_LIVE}" if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ] then @@ -186,7 +186,7 @@ for KERNEL in chroot/boot/vmlinuz-* do VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')" - Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" + Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${LB_BOOTAPPEND_LIVE}" Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${LB_BOOTAPPEND_LIVE_FAILSAFE}" done @@ -250,7 +250,7 @@ fi cp ${FILES} binary/boot/grub sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst -sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/menu.lst +sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" binary/boot/grub/menu.lst sed -i -e 's|\ $||g' binary/boot/grub/menu.lst |