[SCM] live-build branch, debian-next, updated. debian/3.0_a60-1-2-gb693418
Daniel Baumann
daniel at debian.org
Sun Sep 30 06:30:09 UTC 2012
The following commit has been merged in the debian-next branch:
commit b6934184597134270be8f09afb6edca1c45c57f7
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 30 08:30:06 2012 +0200
Using dedicated initrd line in syslinux configurations rather than stuffing everything in one line.
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index e89e59c..749dd24 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at 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- at 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 e89e59c..749dd24 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at 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- at 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 e89e59c..749dd24 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at 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- at 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 e89e59c..749dd24 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at 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- at 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@
--
live-build
More information about the debian-live-changes
mailing list