manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify internal replacement strings when processing syslinux configuration files.

This commit is contained in:
Daniel Baumann 2012-10-01 04:43:14 +02:00
parent c9def02d74
commit fd73a68615
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build/binary_syslinux
View File

@ -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

8
share/bootloaders/extlinux/live.cfg.in
View File

@ -1,13 +1,13 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
append @APPEND_LIVE@ @APPEND_FAILSAFE@

8
share/bootloaders/isolinux/live.cfg.in
View File

@ -1,13 +1,13 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
append @APPEND_LIVE@ @APPEND_FAILSAFE@

8
share/bootloaders/pxelinux/live.cfg.in
View File

@ -1,13 +1,13 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
append @APPEND_LIVE@ @APPEND_FAILSAFE@

8
share/bootloaders/syslinux/live.cfg.in
View File

@ -1,13 +1,13 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
linux @KERNEL@
linux @LINUX@
initrd @INITRD@
append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
append @APPEND_LIVE@ @APPEND_FAILSAFE@