[SCM] live-build branch, debian-next, updated. debian/3.0_a61-1-9-gc9def02

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c9def02d74172e49ab96fa4fc05e888eb8abc3dc
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 1 04:39:27 2012 +0200

    Using linux rather than kernel directive in syslinux configuration files.

diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index 8dca4d5..798fc61 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index 8dca4d5..798fc61 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index 8dca4d5..798fc61 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index 8dca4d5..798fc61 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	kernel @KERNEL@
+	linux @KERNEL@
 	initrd @INITRD@
 	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@

-- 
live-build