summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-09-30 08:30:06 +0200
committerDaniel Baumann <daniel@debian.org>2012-09-30 08:30:06 +0200
commitb6934184597134270be8f09afb6edca1c45c57f7 (patch)
tree900d99dcdeb7990d8e1563c8c5545e8e63899f20 /share
parent68331c3f970e0d613dcd3d05460cce29676c4848 (diff)
downloadvyos-live-build-b6934184597134270be8f09afb6edca1c45c57f7.tar.gz
vyos-live-build-b6934184597134270be8f09afb6edca1c45c57f7.zip
Using dedicated initrd line in syslinux configurations rather than stuffing everything in one line.
Diffstat (limited to 'share')
-rw-r--r--share/bootloaders/extlinux/live.cfg.in6
-rw-r--r--share/bootloaders/isolinux/live.cfg.in6
-rw-r--r--share/bootloaders/pxelinux/live.cfg.in6
-rw-r--r--share/bootloaders/syslinux/live.cfg.in6
4 files changed, 16 insertions, 8 deletions
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index e89e59c6f..749dd2404 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -2,10 +2,12 @@ label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append 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@
+ initrd @INITRD@
+ append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index e89e59c6f..749dd2404 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -2,10 +2,12 @@ label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append 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@
+ initrd @INITRD@
+ append 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 e89e59c6f..749dd2404 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -2,10 +2,12 @@ label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append 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@
+ initrd @INITRD@
+ append 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 e89e59c6f..749dd2404 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -2,10 +2,12 @@ label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append 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@
+ initrd @INITRD@
+ append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@