From fd73a6861570a75255615e2f14d1e9e7e2bf0e71 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Oct 2012 04:43:14 +0200 Subject: Simplify internal replacement strings when processing syslinux configuration files. --- share/bootloaders/extlinux/live.cfg.in | 8 ++++---- share/bootloaders/isolinux/live.cfg.in | 8 ++++---- share/bootloaders/pxelinux/live.cfg.in | 8 ++++---- share/bootloaders/syslinux/live.cfg.in | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'share') 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@ -- cgit v1.2.3