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

daniel at alioth.debian.org daniel at alioth.debian.org
Wed May 23 14:22:50 UTC 2007


Author: daniel
Date: 2007-05-23 14:22:50 +0000 (Wed, 23 May 2007)
New Revision: 1641

Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/docs/TODO
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_binary_net
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_chroot_sources
   dists/trunk/live-helper/helpers/lh_config
   dists/trunk/live-helper/helpers/make-live
   dists/trunk/live-helper/templates/syslinux/pxelinux.cfg
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/debian/changelog	2007-05-23 14:22:50 UTC (rev 1641)
@@ -1,4 +1,4 @@
-live-helper (1.0~a10-1) UNRELEASED; urgency=medium
+live-helper (1.0~a10-1) unstable; urgency=medium
 
   * New upstream release:
     - really removed forgotten set -x in the cron (Closes: #421105).

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-05-23 14:22:50 UTC (rev 1641)
@@ -6,6 +6,9 @@
 	  - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
 	  - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
 	  - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
+	  - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
+	  - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
+	* Uploaded 1.0~a10-1.
 
 2007-05-18  Mathieu Geli  <mathieu.geli at gmail.com>
 
@@ -27,7 +30,7 @@
 
 	* helpers/*:
 	  - Added check for local includes and templates.
-	  - Renamed LH_APT_GENERIC to LH_BINARY_INDICES.
+	  - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
 	  - Renamed lh_binary_localincludes to lh_binary_local-includes.
 	  - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
 	  - Renamed lh_chroot_localincludes to lh_chroot_local-includes.

Modified: dists/trunk/live-helper/docs/TODO
===================================================================
--- dists/trunk/live-helper/docs/TODO	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/docs/TODO	2007-05-23 14:22:50 UTC (rev 1641)
@@ -6,10 +6,12 @@
 
 
 1.0~a10-1:
-  * check variable/helper/conffile names
   * add compat code for old syslinux
   * mkisofs parameter quoting
 
+1.0~a10-1:
+  * reordering content of configuration files
+
 ALPHA series:
 
 FIXME

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-05-23 14:22:50 UTC (rev 1641)
@@ -61,9 +61,9 @@
 	fi
 
 	# Setting apt indices
-	if [ -z "${LH_BINARY_INDICES}" ]
+	if [ -z "${LIVE_BINARY_INDICES}" ]
 	then
-		LH_BINARY_INDICES="enabled"
+		LIVE_BINARY_INDICES="enabled"
 	fi
 
 	# Setting apt pdiffs
@@ -598,21 +598,21 @@
 	fi
 
 	# Setting netboot server address
-	if [ -z "${LIVE_SERVER_ADDRESS}" ]
+	if [ -z "${LIVE_NET_SERVER}" ]
 	then
-		LIVE_SERVER_ADDRESS="192.168.1.1"
+		LIVE_NET_SERVER="192.168.1.1"
 	fi
 
 	# Setting netboot server path
-	if [ -z "${LIVE_SERVER_PATH}" ]
+	if [ -z "${LIVE_NET_PATH}" ]
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_SERVER_PATH="/srv/debian-live"
+				LIVE_NET_PATH="/srv/debian-live"
 				;;
 
 			ubuntu)
-				LIVE_SERVER_PATH="/srv/ubuntu-live"
+				LIVE_NET_PATH="/srv/ubuntu-live"
 				;;
 		esac
 	fi

Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/helpers/lh_binary_net	2007-05-23 14:22:50 UTC (rev 1641)
@@ -57,21 +57,21 @@
 		fi
 
 		# Creating image file
-		if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ]
+		if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
 		then
 			mv chroot chroot.tmp
 		fi
 
-		mv binary "`basename ${LIVE_SERVER_PATH}`"
+		mv binary "`basename ${LIVE_NET_PATH}`"
 
 		cd ..
-		tar -cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_SERVER_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+		tar -cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
 		mv binary-net.tar.gz "${OLDPWD}"
 		cd "${OLDPWD}"
 
-		mv "`basename ${LIVE_SERVER_PATH}`" binary
+		mv "`basename ${LIVE_NET_PATH}`" binary
 
-		if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ]
+		if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
 		then
 			mv chroot.tmp chroot
 		fi

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-23 14:22:50 UTC (rev 1641)
@@ -304,7 +304,7 @@
 
 		# Configure syslinux templates
 		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
-		sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" 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_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-23 14:22:50 UTC (rev 1641)
@@ -212,7 +212,7 @@
 		Create_lockfile .lock
 
 		# Configure generic indices
-		if [ "${LH_BINARY_INDICES}" = "enabled" ]
+		if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
 		then
 			# Don't do anything if it's not required
 			if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/helpers/lh_config	2007-05-23 14:22:50 UTC (rev 1641)
@@ -80,10 +80,6 @@
 # (Default: autodetected or empty)
 LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
 
-# \$LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LH_BINARY_INDICES})
-LH_BINARY_INDICES="${LH_BINARY_INDICES}"
-
 # \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
 # (Default: ${LH_APT_PDIFFS})
 LH_APT_PDIFFS="${LH_APT_PDIFFS}"
@@ -288,6 +284,10 @@
 cat > "${LIVE_ROOT}"/config/binary << EOF
 # config/chroot: configuration for lh_binary_*
 
+# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LIVE_BINARY_INDICES})
+LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
+
 # \$LIVE_BOOTAPPEND: set boot parameters
 # (Default: empty)
 LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
@@ -316,13 +316,13 @@
 # (Default: ${LIVE_ISO_VOLUME})
 LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
 
-# \$LIVE_SERVER_ADDRESS: set the netboot server address
-# (Default: ${LIVE_SERVER_ADDRESS})
-LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}"
+# \$LIVE_NET_SERVER: set the netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
 
-# \$LIVE_SERVER_PATH: set the netboot server directory
-# (Default: ${LIVE_SERVER_PATH})
-LIVE_SERVER_PATH="${LIVE_SERVER_PATH}"
+# \$LIVE_NET_PATH: set the netboot server directory
+# (Default: ${LIVE_NET_PATH})
+LIVE_NET_PATH="${LIVE_NET_PATH}"
 
 # \$LIVE_BOOTLOADER: set bootloader
 # (Default: ${LIVE_BOOTLOADER})

Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/helpers/make-live	2007-05-23 14:22:50 UTC (rev 1641)
@@ -31,7 +31,7 @@
 # Set static variables
 PROGRAM="`basename ${0}`"
 DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
 
 HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
 
@@ -248,12 +248,12 @@
 				LIVE_ISO_VOLUME="${2}"; shift 2
 				;;
 
-			--server-address)
-				LIVE_SERVER_ADDRESS="${2}"; shift 2
+			--net-server)
+				LIVE_NET_SERVER="${2}"; shift 2
 				;;
 
-			--server-path)
-				LIVE_SERVER_PATH="${2}"; shift 2
+			--net-path)
+				LIVE_NET_PATH="${2}"; shift 2
 				;;
 
 			--source)
@@ -353,7 +353,7 @@
 	Local_arguments "${@}"
 
 	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
+	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
 
 	if [ "${LH_BREAKPOINTS}" = "enabled" ]
 	then

Modified: dists/trunk/live-helper/templates/syslinux/pxelinux.cfg
===================================================================
--- dists/trunk/live-helper/templates/syslinux/pxelinux.cfg	2007-05-23 14:07:17 UTC (rev 1640)
+++ dists/trunk/live-helper/templates/syslinux/pxelinux.cfg	2007-05-23 14:22:50 UTC (rev 1641)
@@ -1,19 +1,19 @@
 default live
 label live
   kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+  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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+  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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+  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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+  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_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+  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




More information about the Debian-live-changes mailing list