diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-29 09:30:50 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-29 09:30:50 +0200 |
| commit | 224a2304c872e8c3143bb88cb77a35be4bc81e4a (patch) | |
| tree | 01b8199e5cc845f4caa8d735eb26e037ff9e2bb7 | |
| parent | ad8e313e7addaaa9b00fbddeb4b670251696fbd5 (diff) | |
| download | vyos-live-build-224a2304c872e8c3143bb88cb77a35be4bc81e4a.tar.gz vyos-live-build-224a2304c872e8c3143bb88cb77a35be4bc81e4a.zip | |
Adding failsafe entries for syslinux bootloaders in embedded configs.
| -rwxr-xr-x | scripts/build/lb_binary_syslinux | 5 | ||||
| -rw-r--r-- | share/bootloaders/isolinux/live.cfg.in | 6 | ||||
| -rw-r--r-- | share/bootloaders/pxelinux/live.cfg.in | 6 | ||||
| -rw-r--r-- | share/bootloaders/syslinux/live.cfg.in | 6 |
4 files changed, 22 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux index 621c9f070..153acf21c 100755 --- a/scripts/build/lb_binary_syslinux +++ b/scripts/build/lb_binary_syslinux @@ -182,6 +182,7 @@ then -e "s|@KERNEL@|/live/vmlinuz|g" \ -e "s|@INITRD@|/live/initrd.img|g" \ -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg" rm -f "${_TARGET}/live.cfg.in" @@ -201,6 +202,7 @@ then -e "s|@KERNEL@|/live/vmlinuz${_NUMBER}|g" \ -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \ -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg" done @@ -209,7 +211,8 @@ then esac elif [ -e "${_TARGET}/live.cfg" ] then - sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ ${_TARGET}/live.cfg fi diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in index aa01795b6..e89e59c6f 100644 --- a/share/bootloaders/isolinux/live.cfg.in +++ b/share/bootloaders/isolinux/live.cfg.in @@ -3,3 +3,9 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ + +label live-@FLAVOUR@-failsafe + menu label ^Live (@FLAVOUR@ failsafe) + menu default + kernel @KERNEL@ + append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in index aa01795b6..e89e59c6f 100644 --- a/share/bootloaders/pxelinux/live.cfg.in +++ b/share/bootloaders/pxelinux/live.cfg.in @@ -3,3 +3,9 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ + +label live-@FLAVOUR@-failsafe + menu label ^Live (@FLAVOUR@ failsafe) + menu default + kernel @KERNEL@ + append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in index aa01795b6..e89e59c6f 100644 --- a/share/bootloaders/syslinux/live.cfg.in +++ b/share/bootloaders/syslinux/live.cfg.in @@ -3,3 +3,9 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ + +label live-@FLAVOUR@-failsafe + menu label ^Live (@FLAVOUR@ failsafe) + menu default + kernel @KERNEL@ + append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ |