[SCM] live-helper branch, debian-next, updated. debian/2.0_a12-1-8-gd75624f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d75624f418ea5f98f106af86bdeb3032934204df
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon May 17 23:38:58 2010 +0200

    Updating for renaming of live-sysinit to live-config.

diff --git a/helpers/binary_grub b/helpers/binary_grub
index 31b3407..b4d21d1 100755
--- a/helpers/binary_grub
+++ b/helpers/binary_grub
@@ -67,7 +67,7 @@ Grub_live_entry ()
 	APPEND="${4}"
 
 	LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
-	LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-sysinit LH_BOOTAPPEND_LIVE ${APPEND}"
+	LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
 	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
 }
 
diff --git a/helpers/binary_grub2 b/helpers/binary_grub2
index 455afa6..dde12b0 100755
--- a/helpers/binary_grub2
+++ b/helpers/binary_grub2
@@ -67,7 +67,7 @@ Grub_live_entry ()
 	APPEND="${4}"
 
 	LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
-	LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-sysinit LH_BOOTAPPEND_LIVE ${APPEND}"
+	LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
 	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
 	LINUX_LIVE="${LINUX_LIVE}\n}"
 }
diff --git a/helpers/binary_silo b/helpers/binary_silo
index 1bc0d78..aca5afe 100755
--- a/helpers/binary_silo
+++ b/helpers/binary_silo
@@ -81,7 +81,7 @@ Silo_live_entry ()
 	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\t  label=${LABEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  append=\"boot=${INITFS} live-sysinit LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
+	LINUX_LIVE="${LINUX_LIVE}\t  append=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
 }
 
 Silo_install_entry ()
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux
index 3356ff7..116eaf4 100755
--- a/helpers/binary_syslinux
+++ b/helpers/binary_syslinux
@@ -126,7 +126,7 @@ Syslinux_live_entry ()
 	fi
 
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-sysinit ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
 
 	# Failsafe kernel
 	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"
@@ -138,7 +138,7 @@ Syslinux_live_entry ()
 	fi
 
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-sysinit ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
 }
 
 Syslinux_install_entry ()
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot
index cd2f209..2081391 100755
--- a/helpers/binary_yaboot
+++ b/helpers/binary_yaboot
@@ -71,7 +71,7 @@ Yaboot_live_entry ()
 	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-sysinit LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
 	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
 }
 
diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks
index 85421ac..72e7221 100755
--- a/helpers/chroot_hacks
+++ b/helpers/chroot_hacks
@@ -111,7 +111,7 @@ do
 done
 
 # Removing openssh-server hostkeys,
-# they are regenerated by live-sysinit.
+# they are regenerated by live-config.
 #rm -f chroot/etc/ssh/ssh_host_dsa_key chroot/etc/ssh/ssh_host_dsa_key.pub
 #rm -f chroot/etc/ssh/ssh_host_rsa_key chroot/etc/ssh/ssh_host_rsa_key.pub
 

-- 
live-helper