[Debian-live-changes] r2471 - in dists/trunk/live-helper: functions helpers templates/syslinux

daniel at alioth.debian.org daniel at alioth.debian.org
Fri Jul 13 10:48:28 UTC 2007


Author: daniel
Date: 2007-07-13 10:48:28 +0000 (Fri, 13 Jul 2007)
New Revision: 2471

Removed:
   dists/trunk/live-helper/templates/syslinux/pxelinux.cfg
Modified:
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-07-13 01:10:43 UTC (rev 2470)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-07-13 10:48:28 UTC (rev 2471)
@@ -644,6 +644,9 @@
 	# Setting memtest option
 	LIVE_MEMTEST="${LIVE_MEMTEST:-memtest86+}"
 
+	# Setting netboot filesystem
+	LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM:-nfs}"
+
 	# Setting netboot server path
 	if [ -z "${LIVE_NET_PATH}" ]
 	then

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-13 01:10:43 UTC (rev 2470)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-13 10:48:28 UTC (rev 2471)
@@ -71,10 +71,10 @@
 	INITRD="${3}"
 	APPEND="${4}"
 
-	# pxelinux and syslinux << 3.36 lacks support to file/path
-	DIRECTORY="`basename ${DESTDIR_LIVE}`"
-	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
+	# syslinux << 3.36 lacks support to file/path
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_LIVE}`" != "binary" ]
 	then
+		DIRECTORY="`basename ${DESTDIR_LIVE}`"
 		KERNEL="${DIRECTORY}/${KERNEL}"
 		INITRD="${DIRECTORY}/${INITRD}"
 	fi
@@ -91,14 +91,15 @@
 	INITRD="${3}"
 	APPEND="${4}"
 
-	# pxelinux and syslinux << 3.36 lacks support to file/path
-	DIRECTORY="`basename ${DESTDIR_INSTALL}`"
-	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
+	# syslinux << 3.36 lacks support to file/path
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "`basename ${DESTDIR_INSTALL}`" != "binary" ]
 	then
+		DIRECTORY="`basename ${DESTDIR_INSTALL}`"
 		KERNEL="${DIRECTORY}/${KERNEL}"
 		INITRD="${DIRECTORY}/${INITRD}"
 	fi
 
+	# Boot in quiet mode
 	if [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
 	then
 		APPEND="${APPEND} quiet"
@@ -153,7 +154,7 @@
 
 		DESTDIR_INSTALL="binary/install"
 
-		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		# syslinux << 3.36 lacks support for long file/path
 		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 		then
 			DESTDIR_LIVE="binary"
@@ -210,6 +211,29 @@
 	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
 fi
 
+if [ "${LIVE_BINARY_IMAGES}" = "net" ]
+then
+	case "${LIVE_NET_FILESYSTEM}" in
+		nfs)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH"
+			;;
+
+		cifs)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} netboot=cifs nfsroot=//LIVE_NET_SERVERLIVE_NET_PATH"
+			;;
+
+		*)
+			Echo_error "Unsupported net filesystem"
+			exit 1
+			;;
+	esac
+
+	if [ -n "${LIVE_NET_MOUNTOPTIONS}" ]
+	then
+		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} nfsopts=${LIVE_NET_MOUNTOPTIONS}"
+	fi
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
@@ -282,8 +306,8 @@
 then
 	KERNEL_PATH="/`basename ${DESTDIR_LIVE}`/"
 
-	# pxelinux and syslinux << 3.36 lacks support to file/path
-	if [ "${LIVE_BINARY_IMAGES}" = "net" ] || [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+	# syslinux << 3.36 lacks support to file/path
+	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
 	then
 		KERNEL_PATH=""
 	fi
@@ -299,7 +323,6 @@
 		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
 		mv binary/isolinux/syslinux.cfg binary/isolinux/isolinux.cfg
-		rm -f binary/isolinux/pxelinux.cfg
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
@@ -354,10 +377,9 @@
 		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
 		mkdir -p tftpboot/pxelinux.cfg
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
-		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
-		rm -f tftpboot/pxelinux.cfg/syslinux.cfg
+		mv tftpboot/pxelinux.cfg/syslinux.cfg tftpboot/pxelinux.cfg/default
 
-		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
+		#sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
 
 		# Copying splash screen
 		if [ -f config/binary_syslinux/splash.rle ]
@@ -378,24 +400,13 @@
 
 		# Configure syslinux templates
 		sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
-		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" tftpboot/pxelinux.cfg/default
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
 
 		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -eq "1" ]
 		then
-			NUMBER="0"
-
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER="$(($NUMBER + 1))"
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" tftpboot/pxelinux.cfg/default
-			done
-		else
 			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
 			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
 			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" tftpboot/pxelinux.cfg/default
@@ -442,9 +453,6 @@
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
 
-		# Remove unused files
-		rm -f "${DESTDIR}"/pxelinux.cfg
-
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-07-13 01:10:43 UTC (rev 2470)
+++ dists/trunk/live-helper/helpers/lh_config	2007-07-13 10:48:28 UTC (rev 2471)
@@ -357,6 +357,14 @@
 # (Default: ${LIVE_MEMTEST})
 LIVE_MEMTEST="${LIVE_MEMTEST}"
 
+# \$LIVE_NET_FILESYSTEM: set netboot filesystem
+# (Default: ${LIVE_NET_FILESYSTEM})
+LIVE_NET_FILESYSTEM="${LIVE_NET_FILESYSTEM}"
+
+# \$LIVE_NET_MOUNTOPTIONS: set nfsopts
+# (Default: empty)
+LIVE_NET_MOUNTOPTIONS="${LIVE_NET_MOUNTOPTIONS}"
+
 # \$LIVE_NET_PATH: set netboot server directory
 # (Default: ${LIVE_NET_PATH})
 LIVE_NET_PATH="${LIVE_NET_PATH}"

Deleted: dists/trunk/live-helper/templates/syslinux/pxelinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/pxelinux.cfg	2007-07-13 01:10:43 UTC (rev 2470)
+++ dists/trunk/live-helper/templates/syslinux/pxelinux.cfg	2007-07-13 10:48:28 UTC (rev 2471)
@@ -1,27 +0,0 @@
-default live
-label live
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label nfs
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label nfslegacy
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label cifs
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label cifslegacy
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label memtest
-  kernel memtest
-display pxelinux.cfg/isolinux.txt
-timeout 0
-prompt 1
-F1 pxelinux.cfg/f1.txt
-F3 pxelinux.cfg/f3.txt
-F4 pxelinux.cfg/f4.txt
-F8 pxelinux.cfg/f8.txt
-F9 pxelinux.cfg/f9.txt
-F0 pxelinux.cfg/f10.txt




More information about the Debian-live-changes mailing list