Adding live-package 0.99.6-1.

ChangeLog

@@ -1,3 +1,19 @@
+2006-09-08 Marco Amadori <marco.amadori@gmail.com>
+
+	* 23net.sh: Fixed binary missing directory creation.
+	* templates/iso: Moved common files to templates/common.
+
+2006-09-07 Daniel Baumann <daniel@debian.org>
+
+	* Minor cleanups.
+	* Fixed dist target.
+
+2006-09-06 Marco Amadori <marco.amadori@gmail.com>
+
+	* 14chroot.sh, main.sh: Added manifest support.
+	* 23net.sh: Added 2 variables for basenames to ease readability.
+	* main.sh, 02default.sh: Modified Usage() uses.
+
 2006-09-03 Daniel Baumann <daniel@debian.org>
 
 	* Added dist parameter to easily pull images for live.debian.net.

debian/changelog

@@ -1,3 +1,10 @@
+live-package (0.99.6-1) unstable; urgency=medium
+
+  * New upstream release:
+    - fixing netboot.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 11 Sep 2006 00:00:00 +0200
+
 live-package (0.99.5-1) unstable; urgency=low
 
   * New upstream release.

doc/man/make-live.8

@@ -1,4 +1,4 @@
-.TH MAKE-LIVE 8 "Mon,  4 Sep 2006" "0.99.5" "Debian Live framework"
+.TH MAKE-LIVE 8 "Mon,  4 Sep 2006" "0.99" "Debian Live framework"
 
 .SH NAME
 make-live \- utility to build Debian Live systems
@@ -20,13 +20,15 @@ make-live \- utility to build Debian Live systems
 .RB [\| \-f \||\| \-\-flavour
 .IR BOOTSTRAP_FLAVOUR \|]
 .RB [\| \-\-hook
-.IR COMMAND \||\| \|"COMMANDS\|" \|]
+.IR COMMAND \||\| \|"COMMANDS\|" \||\|| FILE \|]
 .RB [\| \-\-include-chroot
 .IR FILE \||\| DIRECTORY \|]
 .RB [\| \-\-include-image
 .IR FILE \||\| DIRECTORY \|]
 .RB [\| \-k \||\| \-\-kernel
 .IR KERNEL_FLAVOUR \|]
+.RB [ \-\-manifest
+.IR PACKAGE \|]
 .RB [\| \-m \||\| \-\-mirror
 .IR URL \|]
 .RB [\| \-\-mirror-security
@@ -91,7 +93,7 @@ Specifies the filesystem for the compressed image. At the moment, ext2, plain an
 .BI "\-f, \-\-flavour " BOOTSTRAP_FLAVOUR
 specifies the bootstrap flavour. This can be either standard or minimal. Instead of this flag, the environment variable LIVE_FLAVOUR can be used (Default: standard).
 .TP
-.BI "\-\-hook " COMMANDS
+.BI "\-\-hook " COMMAND \||\| \|"COMMANDS\|" \||\|| FILE
 specifies one or more commands to be executed in the chroot. Instead of this flag, the environment variable LIVE_HOOK can be used (Default: empty).
 .TP
 .BI "\-\-include-chroot " FILE \||\| DIRECTORY
@@ -103,6 +105,9 @@ specifies a file or directory which will be copied inside the image. Instead of
 .BI "\-k, \-\-kernel " KERNEL_FLAVOUR
 specifies the kernel image flavour. Instead of this flag, the environment variable LIVE_KERNEL can be used (Default: auto-detected).
 .TP
+.BI "\-\-manifest " PACKAGE
+specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, PACKAGE should probably be "ubuntu-live" for ubuntu desktop livecd's. Instead of this flag, the environment variable LIVE_MANIFEST can be used (Default: do not create filesystem.manifest-desktop).
+.TP
 .BI "\-m, \-\-mirror " URL
 specifies the debian mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian).
 .TP

doc/man/make-live.conf.8

@@ -1,4 +1,4 @@
-.TH MAKE-LIVE.CONF 8 "Mon,  4 Sep 2006" "0.99.5" "Debian Live framework"
+.TH MAKE-LIVE.CONF 8 "Mon,  4 Sep 2006" "0.99" "Debian Live framework"
 
 .SH NAME
 make-live.conf \- configuration file for make-live(8)
@@ -42,6 +42,9 @@ specifies a file or a directory to be included into the chroot. Instead of this
 .B LIVE_KERNEL
 specifies the kernel image flavour. Instead of this environment variable, the flag \-k, \-\-kernel can be used.
 .TP
+.BI LIVE_MANIFEST
+specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, in those system it should probably be set to "ubuntu-live" for ubuntu desktop livecd's (Default: do not create filesystem.manifest-desktop).
+.TP
 .B LIVE_MIRROR
 specifies the debian mirror where make-live will download the packages from. Instead of this environment variable, the flag \-m, \-\-mirror LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian).
 .B LIVE_MIRROR_KEY

src/config

@@ -42,6 +42,9 @@
 # Kernel flavour		(Default: auto-detected)
 #LIVE_KERNEL=""
 
+# Desktop package manifest	(Default: empty)
+#LIVE_MANIFEST=""
+
 # Debian mirror			(Default: http://ftp.debian.org/debian/)
 #LIVE_MIRROR="http://ftp.debian.org/debian/"
 

src/main.sh

@@ -28,7 +28,7 @@ set -e
 BASE="/usr/share/make-live"
 CONFIG="/etc/make-live.conf"
 PROGRAM="`basename ${0}`"
-VERSION="0.99.5"
+VERSION="0.99.6"
 
 CODENAME_OLDSTABLE="woody"
 CODENAME_STABLE="sarge"
@@ -41,11 +41,13 @@ do
 	. "${SCRIPT}"
 done
 
+USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
+
 Help ()
 {
 	echo "${PROGRAM} - utility to build Debian Live systems"
 	echo
-	echo "Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
+	echo "${USAGE}"
 	echo "Usage: ${PROGRAM} [-h|--help]"
 	echo "Usage: ${PROGRAM} [-u|--usage]"
 	echo "Usage: ${PROGRAM} [-v|--version]"
@@ -74,6 +76,7 @@ Help ()
 	echo "  --include-chroot: specifies file or directory for chroot inclusion."
 	echo "  --include-image: specifies file or directory for image inclusion."
 	echo "  -k, --kernel: specifies debian kernel flavour."
+	echo "  --manifest: specifies the pivot package to create filesystem.manifest-desktop upon (mostly \"ubuntu-live\")."
 	echo "  -m, --mirror: specifies debian mirror."
 	echo "  --mirror-security: specifies debian security mirror."
 	echo "  --packages: specifies aditional packages."
@@ -91,20 +94,20 @@ Help ()
 	echo "  All settings can be also specified trough environment variables. Please see make-live.conf(8) for more information."
 	echo
 	echo "Report bugs to Debian Live project <http://live.debian.net>."
-	exit 1
+	exit 0
 }
 
 Usage ()
 {
 	echo "${PROGRAM} - utility to build Debian Live systems"
 	echo
-	echo "Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
+	echo "${USAGE}"
 	echo "Usage: ${PROGRAM} [-h|--help]"
 	echo "Usage: ${PROGRAM} [-u|--usage]"
 	echo "Usage: ${PROGRAM} [-v|--version]"
 	echo
 	echo "Try \"${PROGRAM} --help\" for more information."
-	exit 1
+	exit ${1}
 }
 
 Version ()
@@ -132,7 +135,7 @@ Version ()
 	echo "can be found in /usr/share/common-licenses/GPL file."
 	echo
 	echo "Homepage: <http://live.debian.net/>"
-	exit 1
+	exit 0
 }
 
 Configuration ()
@@ -155,7 +158,7 @@ Configuration ()
 
 Main ()
 {
-	ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- ${@}`"
+	ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- ${@}`"
 
 	if [ "${?}" != "0" ]
 	then
@@ -193,34 +196,7 @@ Main ()
 				;;
 
 			-d|--distribution)
-				case "${2}" in
-					"${CODENAME_OLDSTABLE}")
-						LIVE_DISTRIBUTION="oldstable"
-						;;
-
-					"${CODENAME_STABLE}")
-						LIVE_DISTRIBUTION="stable"
-						;;
-
-					"${CODENAME_TESTING}")
-						LIVE_DISTRIBUTION="testing"
-						;;
-
-					"${CODENAME_UNSTABLE}")
-						LIVE_DISTRIBUTION="unstable"
-						;;
-
-					experimental)
-						LIVE_DISTRIBUTION="unstable"
-						LIVE_DISTRIBUTION_EXPERIMENTAL="yes"
-						;;
-
-					*)
-						LIVE_DISTRIBUTION="${2}"
-						;;
-				esac
-
-				shift 2
+				LIVE_DISTRIBUTION="${2}"; shift 2
 				;;
 
 			--filesystem)
@@ -246,6 +222,10 @@ Main ()
 				LIVE_KERNEL="${2}"; shift 2
 				;;
 
+			--manifest)
+				LIVE_MANIFEST="${2}"; shift 2
+				;;
+
 			-m|--mirror)
 				LIVE_MIRROR="${2}"; shift 2
 				;;
@@ -311,7 +291,7 @@ Main ()
 				;;
 
 			-u|--usage)
-				Usage; shift
+				Usage 0; shift
 				;;
 
 			-v|--version)
@@ -340,7 +320,7 @@ Main ()
 		for FLAVOUR in minimal standard gnome kde xfce
 		do
 			( make-live -d testing -o "debian-live-${CODENAME_TESTING}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
-			( make-live -d unstable -o "debian-live-${CODENAME_TESTING}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
+			( make-live -d unstable -o "debian-live-${CODENAME_UNSTABLE}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
 		done
 	fi
 

src/scripts/02defaults.sh

@@ -31,6 +31,7 @@ Defaults ()
 
 			*)
 				echo "E: image type wrong or not yet supported."
+				Usage 1
 				;;
 		esac
 	else
@@ -53,6 +54,33 @@ Defaults ()
 	if [ -z "${LIVE_DISTRIBUTION}" ]
 	then
 		LIVE_DISTRIBUTION="unstable"
+	else
+		case "${LIVE_DISTRIBUTION}" in
+			"${CODENAME_OLDSTABLE}")
+				LIVE_DISTRIBUTION="oldstable"
+				;;
+
+			"${CODENAME_STABLE}")
+				LIVE_DISTRIBUTION="stable"
+				;;
+
+			"${CODENAME_TESTING}")
+				LIVE_DISTRIBUTION="testing"
+				;;
+
+			"${CODENAME_UNSTABLE}")
+				LIVE_DISTRIBUTION="unstable"
+				;;
+
+			experimental)
+				LIVE_DISTRIBUTION="unstable"
+				LIVE_DISTRIBUTION_EXPERIMENTAL="yes"
+				;;
+
+			*)
+				LIVE_DISTRIBUTION="unstable"
+				;;
+		esac
 	fi
 
 	# Set bootstrap flavour
@@ -128,7 +156,7 @@ Defaults ()
 
 			*)
 				echo "FIXME: Architecture not yet supported."
-				exit 1
+				Usage 1
 				;;
 		esac
 	fi

src/scripts/14chroot.sh

@@ -13,6 +13,7 @@ Chroot_exec ()
 {
 	# Execute commands chrooted
 	chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LIVE_PROXY_FTP}" http_proxy="${LIVE_PPROXY_HTTP}" DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" ${1}
+	return ${?}
 }
 
 Chroot ()
@@ -70,7 +71,11 @@ Chroot ()
 		fi
 
 		# Execute extra command in the chroot
-		if [ -n "${LIVE_HOOK}" ]
+		if [ -r "${LIVE_HOOK}" ]
+		then
+			# FIXME
+			Chroot_exec "`cat ${LIVE_HOOK}`"
+		elif [ -n "${LIVE_HOOK}" ]
 		then
 			Chroot_exec "${LIVE_HOOK}"
 		fi
@@ -78,6 +83,15 @@ Chroot ()
 		# Temporary hacks for broken packages
 		Hack_xorg
 
+		# Add filesystem.manifest
+		Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
+
+		if [ ! -z "${LIVE_MANIFEST}" ]
+		then
+			Chroot_exec "apt-get install --yes ${LIVE_MANIFEST}"
+			Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest-desktop
+		fi
+
 		# Clean apt packages cache
 		rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb
 		rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/partial/*.deb

src/scripts/21image.sh

@@ -171,7 +171,8 @@ Syslinux ()
 				cp -r "${LIVE_TEMPLATES}"/syslinux/* \
 					"${LIVE_ROOT}"/tftpboot/pxelinux.cfg
 				mv "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/pxelinux.cfg "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/default
-				rm -f "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.*
+				rm -f "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.cfg
+				sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/isolinux.txt
 
 				# Configure syslinux templates
 				sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${LIVE_ROOT}"/tftpboot/pxelinux.cfg/default

src/scripts/22iso.sh

@@ -14,6 +14,7 @@ Iso ()
 	if [ ! -f "${LIVE_ROOT}"/.stage/image_binary ]
 	then
 		mkdir -p "${LIVE_ROOT}"/binary/casper
+		mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper/
 
 		# Switching package indices to default
 		if [ "${LIVE_GENERIC_INDICES}" = "yes" ]
@@ -43,6 +44,7 @@ Iso ()
 		if [ "${LIVE_FLAVOUR}" != "minimal" ]
 		then
 			cp -r "${LIVE_TEMPLATES}"/iso/* "${LIVE_ROOT}"/binary
+			cp -r "${LIVE_TEMPLATES}"/common/* "${LIVE_ROOT}"/binary
 		fi
 
 		# Calculating md5sums

src/scripts/23net.sh

@@ -13,6 +13,10 @@ Net ()
 {
 	if [ ! -f "${LIVE_ROOT}"/.stage/image_binary ]
 	then
+		mkdir -p "${LIVE_ROOT}"/binary/casper
+		cp -r "${LIVE_TEMPLATES}"/common/* "${LIVE_ROOT}"/binary
+		mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper
+
 		# Installing smbfs
 		Chroot_exec "apt-get install --yes smbfs"