diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-27 20:31:49 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-27 20:31:49 +0200 |
| commit | 58cb79b8cdfe7b2dce672b033d75d5fc1461851b (patch) | |
| tree | a20032b8cad7b9b9eec5b834dae71ef109450179 /scripts/build/lb_binary_grub2 | |
| parent | 4b333fb98091936fe0cd805e3164e31a4759d810 (diff) | |
| download | vyos-live-build-58cb79b8cdfe7b2dce672b033d75d5fc1461851b.tar.gz vyos-live-build-58cb79b8cdfe7b2dce672b033d75d5fc1461851b.zip | |
Transforming failsafe boot parameter into an own option.
Diffstat (limited to 'scripts/build/lb_binary_grub2')
| -rwxr-xr-x | scripts/build/lb_binary_grub2 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 3021fd108..bc61b58f0 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -156,9 +156,6 @@ fi LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')" -# Parameters are listed at: linux/Documentation/kernel-parameters.txt -FAILSAFE="memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" - # Assembling kernel configuration # Default entries @@ -167,14 +164,18 @@ 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 (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${FAILSAFE}" + +if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ] +then + Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_FAILSAFE}" +fi 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} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${FAILSAFE}" + Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${LB_BOOTAPPEND_FAILSAFE}" done LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')" |