[Debian-live-changes] r2270 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-28 14:57:23 +0000 (Thu, 28 Jun 2007)
New Revision: 2270

Modified:
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-28 14:53:41 UTC (rev 2269)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-28 14:57:23 UTC (rev 2270)
@@ -17,47 +17,6 @@
 	. "${FUNCTION}"
 done
 
-# Local methods
-syslinux_live_entry ()
-{
-	label=$1
-	kernel=$2
-	initrd=$3
-	append=$4
-
-	# pxelinux and syslinux << 3.36 lacks support to file/path
-	files_path="/`basename ${DESTDIR_LIVE}`"
-	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "$files_path" != "binary" ]
-	then
-		kernel=$files_path/$kernel
-		initrd=$files_path/$initrd
-	fi
-
-    LINUX="$LINUX\nLABEL $label\n"
-	LINUX="$LINUX\tkernel $kernel\n"
-	LINUX="$LINUX\tappend initrd=$initrd boot=${INITFS} LIVE_BOOTAPPEND $append\n"
-}
-
-syslinux_di_entry ()
-{
-	label=$1
-	kernel=$2
-	initrd=$3
-	append=$4
-
-	# pxelinux and syslinux << 3.36 lacks support to file/path
-	files_path="/`basename ${DESTDIR_INSTALL}`"
-	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "$files_path" != "binary" ]
-	then
-		kernel=$files_path/$kernel
-		initrd=$files_path/$initrd
-	fi
-
-    LIVE_LINUX_INSTALL="$LIVE_LINUX_INSTALL\nLABEL $label\n"
-	LIVE_LINUX_INSTALL="$LIVE_LINUX_INSTALL\tkernel $kernel\n"
-	LIVE_LINUX_INSTALL="$LIVE_LINUX_INSTALL\tappend initrd=$initrd $append --\n"
-}
-
 # Setting static variables
 DESCRIPTION="installs syslinux into binary"
 HELP=""
@@ -104,6 +63,47 @@
 # Installing depends
 Install_package
 
+# Local methods
+Syslinux_live_entry ()
+{
+	label=$1
+	kernel=$2
+	initrd=$3
+	append=$4
+
+	# pxelinux and syslinux << 3.36 lacks support to file/path
+	files_path="/`basename ${DESTDIR_LIVE}`"
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "$files_path" != "binary" ]
+	then
+		kernel=$files_path/$kernel
+		initrd=$files_path/$initrd
+	fi
+
+	LINUX="$LINUX\nLABEL $label\n"
+	LINUX="$LINUX\tkernel $kernel\n"
+	LINUX="$LINUX\tappend initrd=$initrd boot=${INITFS} LIVE_BOOTAPPEND $append\n"
+}
+
+Syslinux_install_entry ()
+{
+	label=$1
+	kernel=$2
+	initrd=$3
+	append=$4
+
+	# pxelinux and syslinux << 3.36 lacks support to file/path
+	files_path="/`basename ${DESTDIR_INSTALL}`"
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "$files_path" != "binary" ]
+	then
+		kernel=$files_path/$kernel
+		initrd=$files_path/$initrd
+	fi
+
+	LIVE_LINUX_INSTALL="$LIVE_LINUX_INSTALL\nLABEL $label\n"
+	LIVE_LINUX_INSTALL="$LIVE_LINUX_INSTALL\tkernel $kernel\n"
+	LIVE_LINUX_INSTALL="$LIVE_LINUX_INSTALL\tappend initrd=$initrd $append --\n"
+}
+
 case "${LH_INITRAMFS}" in
 	casper)
 		INITFS="casper"
@@ -212,8 +212,8 @@
 DEFAULT_KERNEL="`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`"
 DEFAULT_INITRD="initrd.img-`echo ${DEFAULT_KERNEL} | sed -e 's/vmlinuz-//'`"
 
-syslinux_live_entry "live" "$DEFAULT_KERNEL" "$DEFAULT_INITRD"
-syslinux_live_entry "live-failsafe" "$DEFAULT_KERNEL" "$DEFAULT_INITRD" "$FAILSAFE"
+Syslinux_live_entry "live" "$DEFAULT_KERNEL" "$DEFAULT_INITRD"
+Syslinux_live_entry "live-failsafe" "$DEFAULT_KERNEL" "$DEFAULT_INITRD" "$FAILSAFE"
 
 if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 then
@@ -223,8 +223,8 @@
 		KERNEL_VERSION="`echo ${KERNEL_IMG} | sed -e 's/vmlinuz-//'`"
 		INITRD="initrd.img-${KERNEL_VERSION}"
 
-		syslinux_live_entry "live-$KERNEL_VERSION" "$KERNEL_IMG" "$INITRD"
-		syslinux_live_entry "live-$KERNEL_VERSION-failsafe" "$KERNEL_IMG" "$INITRD" "$FAILSAFE"
+		Syslinux_live_entry "live-$KERNEL_VERSION" "$KERNEL_IMG" "$INITRD"
+		Syslinux_live_entry "live-$KERNEL_VERSION-failsafe" "$KERNEL_IMG" "$INITRD" "$FAILSAFE"
 	done
 fi
 
@@ -255,15 +255,15 @@
 		fi
 	fi
 
-	syslinux_di_entry "linux" "$VMLINUZ_DI" "$INITRD_DI" "$APPEND_DI"
-	syslinux_di_entry "install" "$VMLINUZ_DI" "$INITRD_DI" "$APPEND_DI"
-	syslinux_di_entry "installgui" "$VMLINUZ_GI" "$INITRD_GI" "$APPEND_GI"
-	syslinux_di_entry "expert" "$VMLINUZ_DI" "$INITRD_DI" "priority=low $APPEND_DI"
-	syslinux_di_entry "expertgui" "$VMLINUZ_GI" "$INITRD_GI" "priority=low $APPEND_GI"
-	syslinux_di_entry "rescue" "$VMLINUZ_DI" "$INITRD_DI" "rescue/enable=true $APPEND_DI"
-	syslinux_di_entry "rescuegui" "$VMLINUZ_GI" "$INITRD_GI" "rescue/enable=true $APPEND_GI"
-	syslinux_di_entry "auto" "$VMLINUZ_DI" "$INITRD_DI" "auto=true $APPEND_DI"
-	syslinux_di_entry "autogui" "$VMLINUZ_GI" "$INITRD_GI" "auto=true $APPEND_GI"
+	Syslinux_install_entry "linux" "$VMLINUZ_DI" "$INITRD_DI" "$APPEND_DI"
+	Syslinux_install_entry "install" "$VMLINUZ_DI" "$INITRD_DI" "$APPEND_DI"
+	Syslinux_install_entry "installgui" "$VMLINUZ_GI" "$INITRD_GI" "$APPEND_GI"
+	Syslinux_install_entry "expert" "$VMLINUZ_DI" "$INITRD_DI" "priority=low $APPEND_DI"
+	Syslinux_install_entry "expertgui" "$VMLINUZ_GI" "$INITRD_GI" "priority=low $APPEND_GI"
+	Syslinux_install_entry "rescue" "$VMLINUZ_DI" "$INITRD_DI" "rescue/enable=true $APPEND_DI"
+	Syslinux_install_entry "rescuegui" "$VMLINUZ_GI" "$INITRD_GI" "rescue/enable=true $APPEND_GI"
+	Syslinux_install_entry "auto" "$VMLINUZ_DI" "$INITRD_DI" "auto=true $APPEND_DI"
+	Syslinux_install_entry "autogui" "$VMLINUZ_GI" "$INITRD_GI" "auto=true $APPEND_GI"
 fi
 
 LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"