[Debian-live-changes] r2193 - in dists/sid: . live-helper/helpers

daniel at alioth.debian.org daniel at alioth.debian.org
Tue Jun 19 08:36:42 UTC 2007


Author: daniel
Date: 2007-06-19 08:36:42 +0000 (Tue, 19 Jun 2007)
New Revision: 2193

Added:
   dists/sid/live-helper/
   dists/sid/live-helper/helpers/lh_binary_live-installer
   dists/sid/live-helper/helpers/make-live
   dists/sid/live-initramfs/
Removed:
   dists/sid/live-helper/helpers/lh_binary_live-installer
   dists/sid/live-helper/helpers/make-live
Log:


Copied: dists/sid/live-helper (from rev 2172, releases/live-helper/1.0~a15-1)

Deleted: dists/sid/live-helper/helpers/lh_binary_live-installer
===================================================================
--- releases/live-helper/1.0~a15-1/helpers/lh_binary_live-installer	2007-06-18 13:00:31 UTC (rev 2172)
+++ dists/sid/live-helper/helpers/lh_binary_live-installer	2007-06-19 08:36:42 UTC (rev 2193)
@@ -1,333 +0,0 @@
-#!/bin/sh
-
-# lh_binary_live-installer(1) - install live-installer into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
-	. "${FUNCTION}"
-done
-
-# Setting static variables
-DESCRIPTION="install live-installer into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_LIVE_INSTALLER}" != "enabled" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin installing live-installer..."
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_live-installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/install"
-		DI="cdrom"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		DI="netboot"
-
-		Echo_error "Not supported yet (FIXME)"
-		exit 1
-		;;
-
-	tar|usb-hdd)
-		DESTDIR="binary/install"
-		DI="hd-media"
-
-		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-		then
-			DESTDIR="binary"
-		fi
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-
-			powerpc)
-				DESTDIR="${DESTDIR}.ppc"
-				;;
-		esac
-	fi
-fi
-
-VMLINUZ_DI="vmlinuz"
-INITRD_DI="initrd.gz"
-DESTDIR_DI="${DESTDIR}"
-
-VMLINUZ_GI="gtk/vmlinuz"
-INITRD_GI="gtk/initrd.gz"
-DESTDIR_GI="${DESTDIR}/gtk"
-
-# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ]
-then
-	if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
-	then
-		VMLINUZ_DI="vmlinuz.di"
-		INITRD_DI="initrddi.gz"
-		DESTDIR_DI="${DESTDIR}"
-
-		VMLINUZ_GI="vmlinuz.gi"
-		INITRD_GI="initrdgi.gz"
-		DESTDIR_GI="${DESTDIR}"
-	fi
-fi
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR_DI}"
-wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
-	mkdir -p "${DESTDIR_GI}"
-	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
-fi
-
-# Downloading additional packages
-mkdir -p chroot/binary.deb/archives/partial
-mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
-touch chroot/var/lib/dpkg/status
-
-case "${LIVE_ARCHITECTURE}" in
-	amd64)
-		DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
-		;;
-
-	i386)
-		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
-		;;
-
-	powerpc)
-		DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
-		;;
-esac
-
-Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
-mv chroot/binary.deb ./
-mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
-# Including base debian packages
-if [ -d cache/packages_bootstrap ]
-then
-	for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
-	do
-		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
-
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
-				;;
-
-			*)
-				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
-				;;
-		esac
-
-		# Install directory
-		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Move files
-		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
-	done
-fi
-
-# Generating deb indices
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
-
-cd binary
-apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
-gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
-#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
-#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
-cd "${OLDPWD}"
-
-# Fetching release
-wget http://"${MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
-
-#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
-#Archive: stable
-#Version: 4.0r0
-#Component: main
-#Origin: Debian
-#Label: Debian
-#Architecture: source
-#EOF
-
-mkdir binary.udeb
-cd binary.udeb
-
-# Downloading udeb indices
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-
-# Sorting udebs
-UDEBS="`awk '/Filename: / { print $2 }' Packages`"
-
-# Downloading udebs
-for UDEB in ${UDEBS}
-do
-	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
-done
-
-# Including local udebs
-if ls ../config/binary_local-udebs/* &> /dev/null
-then
-	for FILE in ../config/binary_local-udebs/*.udeb
-	do
-		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
-
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
-				;;
-
-			*)
-				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
-				;;
-		esac
-
-		# Install directory
-		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Copy files
-		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Prefere local udebs over downloaded udebs
-		rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
-	done
-fi
-
-# Excluding udebs
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
-
-for EXCLUDE in `cat exclude`
-do
-	rm -f "${EXCLUDE}"_*.udeb
-done
-
-# Moving udebs
-for UDEB in ${UDEBS}
-do
-	if [ -f "`basename ${UDEB}`" ]
-	then
-		mkdir -p `dirname ${UDEB}`
-		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
-	fi
-done
-
-# Creating udeb indices
-mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
-gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
-
-rm -f Packages* exclude
-find . | cpio -dmpu "${OLDPWD}"/binary
-cd "${OLDPWD}"
-
-rm -rf binary.udeb
-rm -rf binary.deb
-
-# Generating release file
-apt-ftparchive \
-	-o APT::FTPArchive::Release::Origin="Debian" \
-	-o APT::FTPArchive::Release::Label="Debian" \
-	-o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
-	-o APT::FTPArchive::Release::Version="4.0" \
-	-o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
-	-o APT::FTPArchive::Release::Date="`date -R`" \
-	-o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
-	-o APT::FTPArchive::Release::Components="main" \
-	-o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
-release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-
-# Creating dist symlinks
-for DISTRIBUTION in frozen stable testing unstable
-do
-	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-ln -s . binary/debian
-
-# Creating disk info
-mkdir binary/.disk
-echo "main" > binary/.disk/base_components
-touch binary/.disk/base_installable
-echo "not_complete" > binary/.disk/cd_type
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
-touch binary/.disk/mkisofs
-cat > binary/.disk/udeb_include << EOF
-netcfg
-ethdetect
-pcmcia-cs-udeb
-pcmciautils-udeb
-wireless-tools-udeb
-live-installer
-EOF
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer

Copied: dists/sid/live-helper/helpers/lh_binary_live-installer (from rev 2177, releases/live-helper/1.0~a15-1/helpers/lh_binary_live-installer)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_live-installer	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_live-installer	2007-06-19 08:36:42 UTC (rev 2193)
@@ -0,0 +1,333 @@
+#!/bin/sh
+
+# lh_binary_live-installer(1) - install live-installer into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install live-installer into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_LIVE_INSTALLER}" != "enabled" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing live-installer..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_live-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/install"
+		DI="cdrom"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		DI="netboot"
+
+		Echo_error "Not supported yet (FIXME)"
+		exit 1
+		;;
+
+	tar|usb-hdd)
+		DESTDIR="binary/install"
+		DI="hd-media"
+
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+		then
+			DESTDIR="binary"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+
+			powerpc)
+				DESTDIR="${DESTDIR}.ppc"
+				;;
+		esac
+	fi
+fi
+
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+then
+	if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+	then
+		VMLINUZ_DI="vmlinuz.di"
+		INITRD_DI="initrddi.gz"
+		DESTDIR_DI="${DESTDIR}"
+
+		VMLINUZ_GI="vmlinuz.gi"
+		INITRD_GI="initrdgi.gz"
+		DESTDIR_GI="${DESTDIR}"
+	fi
+fi
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR_DI}"
+wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+	mkdir -p "${DESTDIR_GI}"
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
+fi
+
+# Downloading additional packages
+mkdir -p chroot/binary.deb/archives/partial
+mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+touch chroot/var/lib/dpkg/status
+
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
+		;;
+
+	i386)
+		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
+		;;
+
+	powerpc)
+		DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
+		;;
+esac
+
+Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
+mv chroot/binary.deb ./
+mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
+# Including base debian packages
+if [ -d cache/packages_bootstrap ]
+then
+	for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
+# Generating deb indices
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cd binary
+apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
+#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+cd "${OLDPWD}"
+
+# Fetching release
+wget http://"${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
+
+#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
+#Archive: stable
+#Version: 4.0r0
+#Component: main
+#Origin: Debian
+#Label: Debian
+#Architecture: source
+#EOF
+
+mkdir binary.udeb
+cd binary.udeb
+
+# Downloading udeb indices
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+
+# Sorting udebs
+UDEBS="`awk '/Filename: / { print $2 }' Packages`"
+
+# Downloading udebs
+for UDEB in ${UDEBS}
+do
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+done
+
+# Including local udebs
+if ls ../config/binary_local-udebs/* &> /dev/null
+then
+	for FILE in ../config/binary_local-udebs/*.udeb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Copy files
+		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Prefere local udebs over downloaded udebs
+		rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
+	done
+fi
+
+# Excluding udebs
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
+
+for EXCLUDE in `cat exclude`
+do
+	rm -f "${EXCLUDE}"_*.udeb
+done
+
+# Moving udebs
+for UDEB in ${UDEBS}
+do
+	if [ -f "`basename ${UDEB}`" ]
+	then
+		mkdir -p `dirname ${UDEB}`
+		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
+	fi
+done
+
+# Creating udeb indices
+mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
+
+rm -f Packages* exclude
+find . | cpio -dmpu "${OLDPWD}"/binary
+cd "${OLDPWD}"
+
+rm -rf binary.udeb
+rm -rf binary.deb
+
+# Generating release file
+apt-ftparchive \
+	-o APT::FTPArchive::Release::Origin="Debian" \
+	-o APT::FTPArchive::Release::Label="Debian" \
+	-o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Version="4.0" \
+	-o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Date="`date -R`" \
+	-o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
+	-o APT::FTPArchive::Release::Components="main" \
+	-o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
+release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+
+# Creating dist symlinks
+for DISTRIBUTION in frozen stable testing unstable
+do
+	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+ln -s . binary/debian
+
+# Creating disk info
+mkdir binary/.disk
+echo "main" > binary/.disk/base_components
+touch binary/.disk/base_installable
+echo "not_complete" > binary/.disk/cd_type
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+touch binary/.disk/mkisofs
+cat > binary/.disk/udeb_include << EOF
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
+live-installer
+EOF
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer

Deleted: dists/sid/live-helper/helpers/make-live
===================================================================
--- releases/live-helper/1.0~a15-1/helpers/make-live	2007-06-18 13:00:31 UTC (rev 2172)
+++ dists/sid/live-helper/helpers/make-live	2007-06-19 08:36:42 UTC (rev 2193)
@@ -1,410 +0,0 @@
-#!/bin/sh
-
-# make-live(1) - utility to build Debian Live systems
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
-
-set -e
-
-# Including common functions
-LH_BASE="${LH_BASE:-/usr/share/live-helper}"
-
-for FUNCTION in "${LH_BASE}"/functions/*.sh
-do
-	. "${FUNCTION}"
-done
-
-# Setting 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] [--binary-indices 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 iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--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"
-
-Local_arguments ()
-{
-	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
-	if [ "${?}" -ne "0" ]
-	then
-		echo "Terminating." >&2
-		exit 1
-	fi
-
-	if [ "${1}" = "config" ]
-	then
-		CONFIG="true"
-	fi
-
-	eval set -- "${ARGUMENTS}"
-
-	while true
-	do
-		case "${1}" in
-			# common
-			--mode)
-				LH_MODE="${2}"; shift 2
-				;;
-
-			--config)
-				LH_CONFIG="${2}"; shift 2
-				;;
-
-			--apt)
-				LH_APT="${2}"; shift 2
-				;;
-
-			--apt-ftpproxy)
-				LH_APT_FTPPROXY="${2}"; shift 2
-				;;
-
-			--apt-httpproxy)
-				LH_APT_HTTPPROXY="${2}"; shift 2
-				;;
-
-			--binary-indices)
-				LH_BINARY_INDICES="${2}"; shift 2
-				;;
-
-			--apt-pdiffs)
-				LH_APT_PDIFFS="${2}"; shift 2
-				;;
-
-			--apt-recommends)
-				LH_APT_RECOMMENDS="${2}"; shift 2
-				;;
-
-			--apt-secure)
-				LH_APT_SECURE="${2}"; shift 2
-				;;
-
-			--bootstrap)
-				LH_BOOTSTRAP="${2}"; shift 2
-				;;
-
-			--cache)
-				LH_CACHE="${2}"; shift 2
-				;;
-
-			--debconf-frontend)
-				LH_DEBCONF_FRONTEND="${2}"; shift 2
-				;;
-
-			--debconf-priority)
-				LH_DEBCONF_PRIORITY="${2}"; shift 2
-				;;
-
-			--debconf-nowarnings)
-				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
-				;;
-
-			--genisoimage)
-				LH_GENISOIMAGE="${2}"; shift 2
-				;;
-
-			--losetup)
-				LH_LOSETUP="${2}"; shift 2
-				;;
-
-			--tasksel)
-				LH_TASKSEL="${2}"; shift 2
-				;;
-
-			-r|--root)
-				LIVE_ROOT="${2}"; shift 2
-				;;
-
-			--root-command)
-				LIVE_ROOT_COMMAND="${2}"; shift 2
-				;;
-
-			# bootstrap
-			-a|--architecture)
-				LIVE_ARCHITECTURE="${2}"; shift 2
-				;;
-
-			-d|--distribution)
-				LIVE_DISTRIBUTION="${2}"; shift 2
-				export LIVE_DISTRIBUTION
-				;;
-
-			--distribution-config)
-				LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
-				;;
-
-			-f|--bootstrap-flavour)
-				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
-				;;
-
-			-m|--mirror-bootstrap)
-				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
-				;;
-
-			--mirror-bootstrap-security)
-				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
-				;;
-
-			--mirror-binary)
-				LIVE_MIRROR_BINARY="${2}"; shift 2
-				;;
-
-			--mirror-binary-security)
-				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
-				;;
-
-			--sections)
-				LIVE_SECTIONS="${2}"; shift 2
-				;;
-
-			# chroot
-			--interactive)
-				LIVE_INTERACTIVE="${2}"; shift 2
-				;;
-
-			--initramfs)
-				LH_INITRAMFS="${2}"; shift 2
-				;;
-
-			-k|--linux-flavours)
-				LIVE_LINUX_FLAVOURS="${2}"; shift 2
-				;;
-
-			--linux-packages)
-				LIVE_LINUX_PACKAGES="${2}"; shift 2
-				;;
-
-			--keyring-packages)
-				LIVE_KEYRING_PACKAGS="${2}"; shift 2
-				;;
-
-			--hooks)
-				LIVE_HOOKS="${2}"; shift 2
-				;;
-
-			-l|--language)
-				LIVE_LANGUAGE="${2}"; shift 2
-				;;
-
-			--packages)
-				LIVE_PACKAGES="${2}"; shift 2
-				;;
-
-			-p|--packages-lists)
-				LIVE_PACKAGES_LISTS="${2}"; shift 2
-				;;
-
-			--tasks)
-				LIVE_TASKS="${2}"; shift 2
-				;;
-
-			--security)
-				LIVE_SECURITY="${2}"; shift 2
-				;;
-
-			--symlinks)
-				LIVE_SYMLINKS="${2}"; shift 2
-				;;
-
-			--sysvinit)
-				LIVE_SYSVINIT="${2}"; shift 2
-				;;
-
-			# image
-			--bootappend)
-				LIVE_BOOTAPPEND="${2}"; shift 2
-				;;
-
-			-e|--encryption)
-				LIVE_ENCRYPTION="${2}"; shift 2
-				;;
-
-			--username)
-				LIVE_USERNAME="${2}"; shift 2
-				;;
-
-			--hostname)
-				LIVE_HOSTNAME="${2}"; shift 2
-				;;
-
-			--chroot-filesystem)
-				LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
-				;;
-
-			--memtest)
-				LIVE_MEMTEST="${2}"; shift 2
-				;;
-
-			--iso-application)
-				LIVE_ISO_APPLICATION="${2}"; shift 2
-				;;
-
-			--iso-preparer)
-				LIVE_ISO_PREPARER="${2}"; shift 2
-				;;
-
-			--iso-publisher)
-				LIVE_ISO_PUBLISHER="${2}"; shift 2
-				;;
-
-			--iso-volume)
-				LIVE_ISO_VOLUME="${2}"; shift 2
-				;;
-
-			--net-server)
-				LIVE_NET_SERVER="${2}"; shift 2
-				;;
-
-			--net-path)
-				LIVE_NET_PATH="${2}"; shift 2
-				;;
-
-			--source)
-				LIVE_SOURCE="${2}"; shift 2
-				;;
-
-			--bootloader)
-				LIVE_BOOTLOADER="${2}"; shift 2
-				;;
-
-			--grub-splash)
-				LIVE_GRUB_SPLASH="${2}"; shift 2
-				;;
-
-			--syslinux-splash)
-				LIVE_SYSLINUX_SPLASH="${2}"; shift 2
-				;;
-
-			-b|--binary-images)
-				LIVE_BINARY_IMAGES="${2}"; shift 2
-				;;
-
-			-s|--source-images)
-				LIVE_SOURCE_IMAGES="${2}"; shift 2
-				;;
-
-			--includes)
-				LIVE_INCLUDES="${2}"; shift 2
-				;;
-
-			--templates)
-				LIVE_TEMPLATES="${2}"; shift 2
-				;;
-
-			# other
-			-h|--help)
-				Help; shift
-				;;
-
-			-u|--usage)
-				Usage; shift
-				;;
-
-			-v|--version)
-				Version; shift
-				;;
-
-			--breakpoints)
-				LH_BREAKPOINTS="enabled"; shift
-				;;
-
-			--debug)
-				LH_DEBUG="enabled"; shift
-				;;
-
-			--force)
-				LH_FORCE="enabled"; shift
-				;;
-
-			--quiet)
-				LH_QUIET="enabled"; shift
-				;;
-
-			--verbose)
-				LH_VERBOSE="enabled"; shift
-				;;
-
-			--)
-				shift; break
-				;;
-
-			*)
-				echo "Internal error."
-				exit 1
-				;;
-		esac
-	done
-}
-
-Main ()
-{
-	Local_arguments "${@}"
-
-	Set_defaults
-
-	ROOT="${ROOT:-$LIVE_ROOT}"
-
-	# Source existing configuration
-	Read_conffile "${ROOT}"/config/common
-	Read_conffile "${ROOT}"/config/bootstrap
-	Read_conffile "${ROOT}"/config/chroot
-	Read_conffile "${ROOT}"/config/binary
-	Read_conffile "${ROOT}"/config/source
-
-	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_BINARY_INDICES="${LH_BINARY_INDICES}" 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_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" 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_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
-
-	if [ "${LH_BREAKPOINTS}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --breakpoints"
-	fi
-
-	if [ "${LH_DEBUG}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --debug"
-	fi
-
-	if [ "${LH_FORCE}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --force"
-	fi
-
-	if [ "${LH_QUIET}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --quiet"
-	fi
-
-	if [ "${LH_VERBOSE}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --verbose"
-	fi
-
-	# Building
-	if [ -z "${CONFIG}" ]
-	then
-		cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
-	fi
-}
-
-trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
-      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
-      0 1 2 3 9 15
-
-Main "${@}"

Copied: dists/sid/live-helper/helpers/make-live (from rev 2177, releases/live-helper/1.0~a15-1/helpers/make-live)
===================================================================
--- dists/sid/live-helper/helpers/make-live	                        (rev 0)
+++ dists/sid/live-helper/helpers/make-live	2007-06-19 08:36:42 UTC (rev 2193)
@@ -0,0 +1,410 @@
+#!/bin/sh
+
+# make-live(1) - utility to build Debian Live systems
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# On Debian systems, the complete text of the GNU General Public License
+# can be found in /usr/share/common-licenses/GPL file.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting 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] [--binary-indices 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 iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--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"
+
+Local_arguments ()
+{
+	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+
+	if [ "${?}" -ne "0" ]
+	then
+		echo "Terminating." >&2
+		exit 1
+	fi
+
+	if [ "${1}" = "config" ]
+	then
+		CONFIG="true"
+	fi
+
+	eval set -- "${ARGUMENTS}"
+
+	while true
+	do
+		case "${1}" in
+			# common
+			--mode)
+				LH_MODE="${2}"; shift 2
+				;;
+
+			--config)
+				LH_CONFIG="${2}"; shift 2
+				;;
+
+			--apt)
+				LH_APT="${2}"; shift 2
+				;;
+
+			--apt-ftpproxy)
+				LH_APT_FTPPROXY="${2}"; shift 2
+				;;
+
+			--apt-httpproxy)
+				LH_APT_HTTPPROXY="${2}"; shift 2
+				;;
+
+			--binary-indices)
+				LIVE_BINARY_INDICES="${2}"; shift 2
+				;;
+
+			--apt-pdiffs)
+				LH_APT_PDIFFS="${2}"; shift 2
+				;;
+
+			--apt-recommends)
+				LH_APT_RECOMMENDS="${2}"; shift 2
+				;;
+
+			--apt-secure)
+				LH_APT_SECURE="${2}"; shift 2
+				;;
+
+			--bootstrap)
+				LH_BOOTSTRAP="${2}"; shift 2
+				;;
+
+			--cache)
+				LH_CACHE="${2}"; shift 2
+				;;
+
+			--debconf-frontend)
+				LH_DEBCONF_FRONTEND="${2}"; shift 2
+				;;
+
+			--debconf-priority)
+				LH_DEBCONF_PRIORITY="${2}"; shift 2
+				;;
+
+			--debconf-nowarnings)
+				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
+				;;
+
+			--genisoimage)
+				LH_GENISOIMAGE="${2}"; shift 2
+				;;
+
+			--losetup)
+				LH_LOSETUP="${2}"; shift 2
+				;;
+
+			--tasksel)
+				LH_TASKSEL="${2}"; shift 2
+				;;
+
+			-r|--root)
+				LIVE_ROOT="${2}"; shift 2
+				;;
+
+			--root-command)
+				LIVE_ROOT_COMMAND="${2}"; shift 2
+				;;
+
+			# bootstrap
+			-a|--architecture)
+				LIVE_ARCHITECTURE="${2}"; shift 2
+				;;
+
+			-d|--distribution)
+				LIVE_DISTRIBUTION="${2}"; shift 2
+				export LIVE_DISTRIBUTION
+				;;
+
+			--distribution-config)
+				LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
+				;;
+
+			-f|--bootstrap-flavour)
+				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
+				;;
+
+			-m|--mirror-bootstrap)
+				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
+				;;
+
+			--mirror-bootstrap-security)
+				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
+				;;
+
+			--mirror-binary)
+				LIVE_MIRROR_BINARY="${2}"; shift 2
+				;;
+
+			--mirror-binary-security)
+				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
+				;;
+
+			--sections)
+				LIVE_SECTIONS="${2}"; shift 2
+				;;
+
+			# chroot
+			--interactive)
+				LIVE_INTERACTIVE="${2}"; shift 2
+				;;
+
+			--initramfs)
+				LH_INITRAMFS="${2}"; shift 2
+				;;
+
+			-k|--linux-flavours)
+				LIVE_LINUX_FLAVOURS="${2}"; shift 2
+				;;
+
+			--linux-packages)
+				LIVE_LINUX_PACKAGES="${2}"; shift 2
+				;;
+
+			--keyring-packages)
+				LIVE_KEYRING_PACKAGS="${2}"; shift 2
+				;;
+
+			--hooks)
+				LIVE_HOOKS="${2}"; shift 2
+				;;
+
+			-l|--language)
+				LIVE_LANGUAGE="${2}"; shift 2
+				;;
+
+			--packages)
+				LIVE_PACKAGES="${2}"; shift 2
+				;;
+
+			-p|--packages-lists)
+				LIVE_PACKAGES_LISTS="${2}"; shift 2
+				;;
+
+			--tasks)
+				LIVE_TASKS="${2}"; shift 2
+				;;
+
+			--security)
+				LIVE_SECURITY="${2}"; shift 2
+				;;
+
+			--symlinks)
+				LIVE_SYMLINKS="${2}"; shift 2
+				;;
+
+			--sysvinit)
+				LIVE_SYSVINIT="${2}"; shift 2
+				;;
+
+			# image
+			--bootappend)
+				LIVE_BOOTAPPEND="${2}"; shift 2
+				;;
+
+			-e|--encryption)
+				LIVE_ENCRYPTION="${2}"; shift 2
+				;;
+
+			--username)
+				LIVE_USERNAME="${2}"; shift 2
+				;;
+
+			--hostname)
+				LIVE_HOSTNAME="${2}"; shift 2
+				;;
+
+			--chroot-filesystem)
+				LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
+				;;
+
+			--memtest)
+				LIVE_MEMTEST="${2}"; shift 2
+				;;
+
+			--iso-application)
+				LIVE_ISO_APPLICATION="${2}"; shift 2
+				;;
+
+			--iso-preparer)
+				LIVE_ISO_PREPARER="${2}"; shift 2
+				;;
+
+			--iso-publisher)
+				LIVE_ISO_PUBLISHER="${2}"; shift 2
+				;;
+
+			--iso-volume)
+				LIVE_ISO_VOLUME="${2}"; shift 2
+				;;
+
+			--net-server)
+				LIVE_NET_SERVER="${2}"; shift 2
+				;;
+
+			--net-path)
+				LIVE_NET_PATH="${2}"; shift 2
+				;;
+
+			--source)
+				LIVE_SOURCE="${2}"; shift 2
+				;;
+
+			--bootloader)
+				LIVE_BOOTLOADER="${2}"; shift 2
+				;;
+
+			--grub-splash)
+				LIVE_GRUB_SPLASH="${2}"; shift 2
+				;;
+
+			--syslinux-splash)
+				LIVE_SYSLINUX_SPLASH="${2}"; shift 2
+				;;
+
+			-b|--binary-images)
+				LIVE_BINARY_IMAGES="${2}"; shift 2
+				;;
+
+			-s|--source-images)
+				LIVE_SOURCE_IMAGES="${2}"; shift 2
+				;;
+
+			--includes)
+				LIVE_INCLUDES="${2}"; shift 2
+				;;
+
+			--templates)
+				LIVE_TEMPLATES="${2}"; shift 2
+				;;
+
+			# other
+			-h|--help)
+				Help; shift
+				;;
+
+			-u|--usage)
+				Usage; shift
+				;;
+
+			-v|--version)
+				Version; shift
+				;;
+
+			--breakpoints)
+				LH_BREAKPOINTS="enabled"; shift
+				;;
+
+			--debug)
+				LH_DEBUG="enabled"; shift
+				;;
+
+			--force)
+				LH_FORCE="enabled"; shift
+				;;
+
+			--quiet)
+				LH_QUIET="enabled"; shift
+				;;
+
+			--verbose)
+				LH_VERBOSE="enabled"; shift
+				;;
+
+			--)
+				shift; break
+				;;
+
+			*)
+				echo "Internal error."
+				exit 1
+				;;
+		esac
+	done
+}
+
+Main ()
+{
+	Local_arguments "${@}"
+
+	Set_defaults
+
+	ROOT="${ROOT:-$LIVE_ROOT}"
+
+	# Source existing configuration
+	Read_conffile "${ROOT}"/config/common
+	Read_conffile "${ROOT}"/config/bootstrap
+	Read_conffile "${ROOT}"/config/chroot
+	Read_conffile "${ROOT}"/config/binary
+	Read_conffile "${ROOT}"/config/source
+
+	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}" LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}" 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_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" 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_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+
+	if [ "${LH_BREAKPOINTS}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --breakpoints"
+	fi
+
+	if [ "${LH_DEBUG}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --debug"
+	fi
+
+	if [ "${LH_FORCE}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --force"
+	fi
+
+	if [ "${LH_QUIET}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --quiet"
+	fi
+
+	if [ "${LH_VERBOSE}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --verbose"
+	fi
+
+	# Building
+	if [ -z "${CONFIG}" ]
+	then
+		cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
+	fi
+}
+
+trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
+      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
+      0 1 2 3 9 15
+
+Main "${@}"

Copied: dists/sid/live-initramfs (from rev 2156, releases/live-initramfs/1.91.1-1)




More information about the Debian-live-changes mailing list