diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-01 04:43:14 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-01 04:43:14 +0200 |
| commit | fd73a6861570a75255615e2f14d1e9e7e2bf0e71 (patch) | |
| tree | 0a61a9393b6e5ae655873c8b9901daddc1e44312 /scripts/build/binary_syslinux | |
| parent | c9def02d74172e49ab96fa4fc05e888eb8abc3dc (diff) | |
| download | vyos-live-build-fd73a6861570a75255615e2f14d1e9e7e2bf0e71.tar.gz vyos-live-build-fd73a6861570a75255615e2f14d1e9e7e2bf0e71.zip | |
Simplify internal replacement strings when processing syslinux configuration files.
Diffstat (limited to 'scripts/build/binary_syslinux')
| -rwxr-xr-x | scripts/build/binary_syslinux | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 7e694e71b..bf2fb0316 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -219,10 +219,10 @@ then mv binary/live/initrd.img-* binary/live/initrd.img sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \ - -e "s|@KERNEL@|/live/vmlinuz|g" \ + -e "s|@LINUX@|/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" \ + -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg" rm -f "${_TARGET}/live.cfg.in" @@ -239,10 +239,10 @@ then mv binary/live/initrd.img-*-${_FLAVOUR} binary/live/initrd${_NUMBER}.img sed -e "s|@FLAVOUR@|${_FLAVOUR}|g" \ - -e "s|@KERNEL@|/live/vmlinuz${_NUMBER}|g" \ + -e "s|@LINUX@|/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" \ + -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ + -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg" done |