summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-10-01 04:43:14 +0200
committerDaniel Baumann <daniel@debian.org>2012-10-01 04:43:14 +0200
commitfd73a6861570a75255615e2f14d1e9e7e2bf0e71 (patch)
tree0a61a9393b6e5ae655873c8b9901daddc1e44312 /share
parentc9def02d74172e49ab96fa4fc05e888eb8abc3dc (diff)
downloadvyos-live-build-fd73a6861570a75255615e2f14d1e9e7e2bf0e71.tar.gz
vyos-live-build-fd73a6861570a75255615e2f14d1e9e7e2bf0e71.zip
Simplify internal replacement strings when processing syslinux configuration files.
Diffstat (limited to 'share')
-rw-r--r--share/bootloaders/extlinux/live.cfg.in8
-rw-r--r--share/bootloaders/isolinux/live.cfg.in8
-rw-r--r--share/bootloaders/pxelinux/live.cfg.in8
-rw-r--r--share/bootloaders/syslinux/live.cfg.in8
4 files changed, 16 insertions, 16 deletions
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index 798fc6137..a307a04e4 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -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@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index 798fc6137..a307a04e4 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -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@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index 798fc6137..a307a04e4 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -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@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index 798fc6137..a307a04e4 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -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@