Adding live-package 0.99.6-1.

87 files changed, 107 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 39dfaffac..47062eb2e 100644
--- a/ChangeLog
+++ b/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.
diff --git a/debian/changelog b/debian/changelog
index 1b92d4996..cd9bf693d 100644
--- a/debian/changelog
+++ b/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.
diff --git a/doc/man/make-live.8 b/doc/man/make-live.8
index 5331cd1b5..405c70faf 100644
--- a/doc/man/make-live.8
+++ b/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
diff --git a/doc/man/make-live.conf.8 b/doc/man/make-live.conf.8
index f761da3d9..312ea8c8f 100644
--- a/doc/man/make-live.conf.8
+++ b/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
diff --git a/src/config b/src/config
index 75b876181..a039aefd0 100644
--- a/src/config
+++ b/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/"
 
diff --git a/src/main.sh b/src/main.sh
index 5d27859ef..524ec3ad3 100755
--- a/src/main.sh
+++ b/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
 
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 78831e7ce..6e54c137b 100644
--- a/src/scripts/02defaults.sh
+++ b/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
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh
index 55ffa9a13..918e09a9e 100644
--- a/src/scripts/14chroot.sh
+++ b/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
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 10c56e249..6357f0908 100644
--- a/src/scripts/21image.sh
+++ b/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
diff --git a/src/scripts/22iso.sh b/src/scripts/22iso.sh
index 07b1f9186..96ab7778b 100644
--- a/src/scripts/22iso.sh
+++ b/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
diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh
index 563420b2e..0b571efd5 100644
--- a/src/scripts/23net.sh
+++ b/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"
 
diff --git a/templates/iso/README.html b/templates/common/README.html
index 33565f317..33565f317 100644
--- a/templates/iso/README.html
+++ b/templates/common/README.html
diff --git a/templates/iso/README.mirrors.html b/templates/common/README.mirrors.html
index b16637b2e..b16637b2e 100644
--- a/templates/iso/README.mirrors.html
+++ b/templates/common/README.mirrors.html
diff --git a/templates/iso/README.mirrors.txt b/templates/common/README.mirrors.txt
index 286f1814f..286f1814f 100644
--- a/templates/iso/README.mirrors.txt
+++ b/templates/common/README.mirrors.txt
diff --git a/templates/iso/README.txt b/templates/common/README.txt
index b847f71e0..b847f71e0 100644
--- a/templates/iso/README.txt
+++ b/templates/common/README.txt
diff --git a/templates/iso/doc/00-INDEX b/templates/common/doc/00-INDEX
index 041eacaa5..041eacaa5 100644
--- a/templates/iso/doc/00-INDEX
+++ b/templates/common/doc/00-INDEX
diff --git a/templates/iso/doc/FAQ/debian-faq.en.html.tar.gz b/templates/common/doc/FAQ/debian-faq.en.html.tar.gz
index d85f3d02b..d85f3d02b 100644
--- a/templates/iso/doc/FAQ/debian-faq.en.html.tar.gz
+++ b/templates/common/doc/FAQ/debian-faq.en.html.tar.gz
diff --git a/templates/iso/doc/FAQ/debian-faq.en.pdf.gz b/templates/common/doc/FAQ/debian-faq.en.pdf.gz
index c8aa37b8f..c8aa37b8f 100644
--- a/templates/iso/doc/FAQ/debian-faq.en.pdf.gz
+++ b/templates/common/doc/FAQ/debian-faq.en.pdf.gz
diff --git a/templates/iso/doc/FAQ/debian-faq.en.ps.gz b/templates/common/doc/FAQ/debian-faq.en.ps.gz
index 86aa67f95..86aa67f95 100644
--- a/templates/iso/doc/FAQ/debian-faq.en.ps.gz
+++ b/templates/common/doc/FAQ/debian-faq.en.ps.gz
diff --git a/templates/iso/doc/FAQ/debian-faq.en.txt.gz b/templates/common/doc/FAQ/debian-faq.en.txt.gz
index ecb1b1a0e..ecb1b1a0e 100644
--- a/templates/iso/doc/FAQ/debian-faq.en.txt.gz
+++ b/templates/common/doc/FAQ/debian-faq.en.txt.gz
diff --git a/templates/iso/doc/FAQ/html/ch-basic_defs.en.html b/templates/common/doc/FAQ/html/ch-basic_defs.en.html
index 74257067e..74257067e 100644
--- a/templates/iso/doc/FAQ/html/ch-basic_defs.en.html
+++ b/templates/common/doc/FAQ/html/ch-basic_defs.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-basic_defs.html b/templates/common/doc/FAQ/html/ch-basic_defs.html
index 6bee626aa..6bee626aa 120000
--- a/templates/iso/doc/FAQ/html/ch-basic_defs.html
+++ b/templates/common/doc/FAQ/html/ch-basic_defs.html
diff --git a/templates/iso/doc/FAQ/html/ch-compat.en.html b/templates/common/doc/FAQ/html/ch-compat.en.html
index 24b527de7..24b527de7 100644
--- a/templates/iso/doc/FAQ/html/ch-compat.en.html
+++ b/templates/common/doc/FAQ/html/ch-compat.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-compat.html b/templates/common/doc/FAQ/html/ch-compat.html
index 069644986..069644986 120000
--- a/templates/iso/doc/FAQ/html/ch-compat.html
+++ b/templates/common/doc/FAQ/html/ch-compat.html
diff --git a/templates/iso/doc/FAQ/html/ch-contributing.en.html b/templates/common/doc/FAQ/html/ch-contributing.en.html
index 9ed5a5633..9ed5a5633 100644
--- a/templates/iso/doc/FAQ/html/ch-contributing.en.html
+++ b/templates/common/doc/FAQ/html/ch-contributing.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-contributing.html b/templates/common/doc/FAQ/html/ch-contributing.html
index 4185524fd..4185524fd 120000
--- a/templates/iso/doc/FAQ/html/ch-contributing.html
+++ b/templates/common/doc/FAQ/html/ch-contributing.html
diff --git a/templates/iso/doc/FAQ/html/ch-customizing.en.html b/templates/common/doc/FAQ/html/ch-customizing.en.html
index fb8988858..fb8988858 100644
--- a/templates/iso/doc/FAQ/html/ch-customizing.en.html
+++ b/templates/common/doc/FAQ/html/ch-customizing.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-customizing.html b/templates/common/doc/FAQ/html/ch-customizing.html
index 1cfdfaae7..1cfdfaae7 120000
--- a/templates/iso/doc/FAQ/html/ch-customizing.html
+++ b/templates/common/doc/FAQ/html/ch-customizing.html
diff --git a/templates/iso/doc/FAQ/html/ch-faqinfo.en.html b/templates/common/doc/FAQ/html/ch-faqinfo.en.html
index 6fdb982a7..6fdb982a7 100644
--- a/templates/iso/doc/FAQ/html/ch-faqinfo.en.html
+++ b/templates/common/doc/FAQ/html/ch-faqinfo.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-faqinfo.html b/templates/common/doc/FAQ/html/ch-faqinfo.html
index 0f759b493..0f759b493 120000
--- a/templates/iso/doc/FAQ/html/ch-faqinfo.html
+++ b/templates/common/doc/FAQ/html/ch-faqinfo.html
diff --git a/templates/iso/doc/FAQ/html/ch-ftparchives.en.html b/templates/common/doc/FAQ/html/ch-ftparchives.en.html
index 013350708..013350708 100644
--- a/templates/iso/doc/FAQ/html/ch-ftparchives.en.html
+++ b/templates/common/doc/FAQ/html/ch-ftparchives.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-ftparchives.html b/templates/common/doc/FAQ/html/ch-ftparchives.html
index cdad69f63..cdad69f63 120000
--- a/templates/iso/doc/FAQ/html/ch-ftparchives.html
+++ b/templates/common/doc/FAQ/html/ch-ftparchives.html
diff --git a/templates/iso/doc/FAQ/html/ch-getting.en.html b/templates/common/doc/FAQ/html/ch-getting.en.html
index 5f608d5b0..5f608d5b0 100644
--- a/templates/iso/doc/FAQ/html/ch-getting.en.html
+++ b/templates/common/doc/FAQ/html/ch-getting.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-getting.html b/templates/common/doc/FAQ/html/ch-getting.html
index 568d808b9..568d808b9 120000
--- a/templates/iso/doc/FAQ/html/ch-getting.html
+++ b/templates/common/doc/FAQ/html/ch-getting.html
diff --git a/templates/iso/doc/FAQ/html/ch-kernel.en.html b/templates/common/doc/FAQ/html/ch-kernel.en.html
index 5e88fad27..5e88fad27 100644
--- a/templates/iso/doc/FAQ/html/ch-kernel.en.html
+++ b/templates/common/doc/FAQ/html/ch-kernel.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-kernel.html b/templates/common/doc/FAQ/html/ch-kernel.html
index 125039fb4..125039fb4 120000
--- a/templates/iso/doc/FAQ/html/ch-kernel.html
+++ b/templates/common/doc/FAQ/html/ch-kernel.html
diff --git a/templates/iso/doc/FAQ/html/ch-nexttime.en.html b/templates/common/doc/FAQ/html/ch-nexttime.en.html
index 0c1d3eca4..0c1d3eca4 100644
--- a/templates/iso/doc/FAQ/html/ch-nexttime.en.html
+++ b/templates/common/doc/FAQ/html/ch-nexttime.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-nexttime.html b/templates/common/doc/FAQ/html/ch-nexttime.html
index da23d4849..da23d4849 120000
--- a/templates/iso/doc/FAQ/html/ch-nexttime.html
+++ b/templates/common/doc/FAQ/html/ch-nexttime.html
diff --git a/templates/iso/doc/FAQ/html/ch-pkg_basics.en.html b/templates/common/doc/FAQ/html/ch-pkg_basics.en.html
index 0ebd3feb3..0ebd3feb3 100644
--- a/templates/iso/doc/FAQ/html/ch-pkg_basics.en.html
+++ b/templates/common/doc/FAQ/html/ch-pkg_basics.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-pkg_basics.html b/templates/common/doc/FAQ/html/ch-pkg_basics.html
index 98c97fece..98c97fece 120000
--- a/templates/iso/doc/FAQ/html/ch-pkg_basics.html
+++ b/templates/common/doc/FAQ/html/ch-pkg_basics.html
diff --git a/templates/iso/doc/FAQ/html/ch-pkgtools.en.html b/templates/common/doc/FAQ/html/ch-pkgtools.en.html
index 114bb9fe2..114bb9fe2 100644
--- a/templates/iso/doc/FAQ/html/ch-pkgtools.en.html
+++ b/templates/common/doc/FAQ/html/ch-pkgtools.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-pkgtools.html b/templates/common/doc/FAQ/html/ch-pkgtools.html
index 6c9eeed19..6c9eeed19 120000
--- a/templates/iso/doc/FAQ/html/ch-pkgtools.html
+++ b/templates/common/doc/FAQ/html/ch-pkgtools.html
diff --git a/templates/iso/doc/FAQ/html/ch-redistrib.en.html b/templates/common/doc/FAQ/html/ch-redistrib.en.html
index f0ac5d0c8..f0ac5d0c8 100644
--- a/templates/iso/doc/FAQ/html/ch-redistrib.en.html
+++ b/templates/common/doc/FAQ/html/ch-redistrib.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-redistrib.html b/templates/common/doc/FAQ/html/ch-redistrib.html
index f1826236b..f1826236b 120000
--- a/templates/iso/doc/FAQ/html/ch-redistrib.html
+++ b/templates/common/doc/FAQ/html/ch-redistrib.html
diff --git a/templates/iso/doc/FAQ/html/ch-software.en.html b/templates/common/doc/FAQ/html/ch-software.en.html
index bedb65f9e..bedb65f9e 100644
--- a/templates/iso/doc/FAQ/html/ch-software.en.html
+++ b/templates/common/doc/FAQ/html/ch-software.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-software.html b/templates/common/doc/FAQ/html/ch-software.html
index f75c0ab2c..f75c0ab2c 120000
--- a/templates/iso/doc/FAQ/html/ch-software.html
+++ b/templates/common/doc/FAQ/html/ch-software.html
diff --git a/templates/iso/doc/FAQ/html/ch-support.en.html b/templates/common/doc/FAQ/html/ch-support.en.html
index 57e21da17..57e21da17 100644
--- a/templates/iso/doc/FAQ/html/ch-support.en.html
+++ b/templates/common/doc/FAQ/html/ch-support.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-support.html b/templates/common/doc/FAQ/html/ch-support.html
index 978d556ab..978d556ab 120000
--- a/templates/iso/doc/FAQ/html/ch-support.html
+++ b/templates/common/doc/FAQ/html/ch-support.html
diff --git a/templates/iso/doc/FAQ/html/ch-uptodate.en.html b/templates/common/doc/FAQ/html/ch-uptodate.en.html
index b271f29f7..b271f29f7 100644
--- a/templates/iso/doc/FAQ/html/ch-uptodate.en.html
+++ b/templates/common/doc/FAQ/html/ch-uptodate.en.html
diff --git a/templates/iso/doc/FAQ/html/ch-uptodate.html b/templates/common/doc/FAQ/html/ch-uptodate.html
index 37f685277..37f685277 120000
--- a/templates/iso/doc/FAQ/html/ch-uptodate.html
+++ b/templates/common/doc/FAQ/html/ch-uptodate.html
diff --git a/templates/iso/doc/FAQ/html/footnotes.en.html b/templates/common/doc/FAQ/html/footnotes.en.html
index 0d5b7d4c5..0d5b7d4c5 100644
--- a/templates/iso/doc/FAQ/html/footnotes.en.html
+++ b/templates/common/doc/FAQ/html/footnotes.en.html
diff --git a/templates/iso/doc/FAQ/html/footnotes.html b/templates/common/doc/FAQ/html/footnotes.html
index c18fdfb77..c18fdfb77 120000
--- a/templates/iso/doc/FAQ/html/footnotes.html
+++ b/templates/common/doc/FAQ/html/footnotes.html
diff --git a/templates/iso/doc/FAQ/html/index.en.html b/templates/common/doc/FAQ/html/index.en.html
index 952a22550..952a22550 100644
--- a/templates/iso/doc/FAQ/html/index.en.html
+++ b/templates/common/doc/FAQ/html/index.en.html
diff --git a/templates/iso/doc/FAQ/html/index.html b/templates/common/doc/FAQ/html/index.html
index 0e8542211..0e8542211 120000
--- a/templates/iso/doc/FAQ/html/index.html
+++ b/templates/common/doc/FAQ/html/index.html
diff --git a/templates/iso/doc/bug-log-access.txt b/templates/common/doc/bug-log-access.txt
index c8fa75f57..c8fa75f57 100644
--- a/templates/iso/doc/bug-log-access.txt
+++ b/templates/common/doc/bug-log-access.txt
diff --git a/templates/iso/doc/bug-log-mailserver.txt b/templates/common/doc/bug-log-mailserver.txt
index aa28efc56..aa28efc56 100644
--- a/templates/iso/doc/bug-log-mailserver.txt
+++ b/templates/common/doc/bug-log-mailserver.txt
diff --git a/templates/iso/doc/bug-mailserver-refcard.txt b/templates/common/doc/bug-mailserver-refcard.txt
index b3ce5456a..b3ce5456a 100644
--- a/templates/iso/doc/bug-mailserver-refcard.txt
+++ b/templates/common/doc/bug-mailserver-refcard.txt
diff --git a/templates/iso/doc/bug-maint-info.txt b/templates/common/doc/bug-maint-info.txt
index 1a450eb99..1a450eb99 100644
--- a/templates/iso/doc/bug-maint-info.txt
+++ b/templates/common/doc/bug-maint-info.txt
diff --git a/templates/iso/doc/bug-maint-mailcontrol.txt b/templates/common/doc/bug-maint-mailcontrol.txt
index 1167b1055..1167b1055 100644
--- a/templates/iso/doc/bug-maint-mailcontrol.txt
+++ b/templates/common/doc/bug-maint-mailcontrol.txt
diff --git a/templates/iso/doc/bug-reporting.txt b/templates/common/doc/bug-reporting.txt
index ca14c2ae9..ca14c2ae9 100644
--- a/templates/iso/doc/bug-reporting.txt
+++ b/templates/common/doc/bug-reporting.txt
diff --git a/templates/iso/doc/constitution.txt b/templates/common/doc/constitution.txt
index 191f73be7..191f73be7 100644
--- a/templates/iso/doc/constitution.txt
+++ b/templates/common/doc/constitution.txt
diff --git a/templates/iso/doc/debian-manifesto b/templates/common/doc/debian-manifesto
index 9322c934f..9322c934f 100644
--- a/templates/iso/doc/debian-manifesto
+++ b/templates/common/doc/debian-manifesto
diff --git a/templates/iso/doc/mailing-lists.txt b/templates/common/doc/mailing-lists.txt
index 2d9297353..2d9297353 100644
--- a/templates/iso/doc/mailing-lists.txt
+++ b/templates/common/doc/mailing-lists.txt
diff --git a/templates/iso/doc/social-contract.txt b/templates/common/doc/social-contract.txt
index cd9c368b1..cd9c368b1 100644
--- a/templates/iso/doc/social-contract.txt
+++ b/templates/common/doc/social-contract.txt
diff --git a/templates/iso/doc/source-unpack.txt b/templates/common/doc/source-unpack.txt
index 151b7337d..151b7337d 100644
--- a/templates/iso/doc/source-unpack.txt
+++ b/templates/common/doc/source-unpack.txt
diff --git a/templates/iso/pics/blue-lowerleft.png b/templates/common/pics/blue-lowerleft.png
index 2a2245e45..2a2245e45 100644
--- a/templates/iso/pics/blue-lowerleft.png
+++ b/templates/common/pics/blue-lowerleft.png
diff --git a/templates/iso/pics/blue-lowerright.png b/templates/common/pics/blue-lowerright.png
index 7e6627145..7e6627145 100644
--- a/templates/iso/pics/blue-lowerright.png
+++ b/templates/common/pics/blue-lowerright.png
diff --git a/templates/iso/pics/blue-upperleft.png b/templates/common/pics/blue-upperleft.png
index a58d0ecb1..a58d0ecb1 100644
--- a/templates/iso/pics/blue-upperleft.png
+++ b/templates/common/pics/blue-upperleft.png
diff --git a/templates/iso/pics/blue-upperright.png b/templates/common/pics/blue-upperright.png
index 2f368493a..2f368493a 100644
--- a/templates/iso/pics/blue-upperright.png
+++ b/templates/common/pics/blue-upperright.png
diff --git a/templates/iso/pics/debian.jpg b/templates/common/pics/debian.jpg
index db62d7a03..db62d7a03 100644
--- a/templates/iso/pics/debian.jpg
+++ b/templates/common/pics/debian.jpg
diff --git a/templates/iso/pics/logo-50.jpg b/templates/common/pics/logo-50.jpg
index 542f0a498..542f0a498 100644
--- a/templates/iso/pics/logo-50.jpg
+++ b/templates/common/pics/logo-50.jpg
diff --git a/templates/iso/pics/red-lowerleft.png b/templates/common/pics/red-lowerleft.png
index caca9c543..caca9c543 100644
--- a/templates/iso/pics/red-lowerleft.png
+++ b/templates/common/pics/red-lowerleft.png
diff --git a/templates/iso/pics/red-lowerright.png b/templates/common/pics/red-lowerright.png
index c27056c59..c27056c59 100644
--- a/templates/iso/pics/red-lowerright.png
+++ b/templates/common/pics/red-lowerright.png
diff --git a/templates/iso/pics/red-upperleft.png b/templates/common/pics/red-upperleft.png
index c1e3301cc..c1e3301cc 100644
--- a/templates/iso/pics/red-upperleft.png
+++ b/templates/common/pics/red-upperleft.png
diff --git a/templates/iso/pics/red-upperright.png b/templates/common/pics/red-upperright.png
index 54d17cafd..54d17cafd 100644
--- a/templates/iso/pics/red-upperright.png
+++ b/templates/common/pics/red-upperright.png
diff --git a/templates/iso/tools/README b/templates/common/tools/README
index bc56f934f..bc56f934f 100644
--- a/templates/iso/tools/README
+++ b/templates/common/tools/README
diff --git a/templates/iso/tools/diskio.zip b/templates/common/tools/diskio.zip
index b30fa96c3..b30fa96c3 100644
--- a/templates/iso/tools/diskio.zip
+++ b/templates/common/tools/diskio.zip
diff --git a/templates/iso/tools/fips20.zip b/templates/common/tools/fips20.zip
index c4a64b6d8..c4a64b6d8 100644
--- a/templates/iso/tools/fips20.zip
+++ b/templates/common/tools/fips20.zip
diff --git a/templates/iso/tools/gzip124.exe b/templates/common/tools/gzip124.exe
index 1a8d1373e..1a8d1373e 100644
--- a/templates/iso/tools/gzip124.exe
+++ b/templates/common/tools/gzip124.exe
diff --git a/templates/iso/tools/lodlin16.zip b/templates/common/tools/lodlin16.zip
index 1e5441e8c..1e5441e8c 100644
--- a/templates/iso/tools/lodlin16.zip
+++ b/templates/common/tools/lodlin16.zip
diff --git a/templates/iso/tools/md5sum-w32.zip b/templates/common/tools/md5sum-w32.zip
index 982202bb7..982202bb7 100644
--- a/templates/iso/tools/md5sum-w32.zip
+++ b/templates/common/tools/md5sum-w32.zip
diff --git a/templates/iso/tools/rawrite1.zip b/templates/common/tools/rawrite1.zip
index abdc229a8..abdc229a8 100644
--- a/templates/iso/tools/rawrite1.zip
+++ b/templates/common/tools/rawrite1.zip
diff --git a/templates/iso/tools/rawrite2.zip b/templates/common/tools/rawrite2.zip
index aa3388504..aa3388504 100644
--- a/templates/iso/tools/rawrite2.zip
+++ b/templates/common/tools/rawrite2.zip
diff --git a/templates/iso/tools/rwwrtwin.zip b/templates/common/tools/rwwrtwin.zip
index 2c3fd1156..2c3fd1156 100644
--- a/templates/iso/tools/rwwrtwin.zip
+++ b/templates/common/tools/rwwrtwin.zip
diff --git a/templates/iso/tools/src/md5sum-w32_1.1.dsc b/templates/common/tools/src/md5sum-w32_1.1.dsc
index 44393f8bd..44393f8bd 100644
--- a/templates/iso/tools/src/md5sum-w32_1.1.dsc
+++ b/templates/common/tools/src/md5sum-w32_1.1.dsc
diff --git a/templates/iso/tools/src/md5sum-w32_1.1.tar.gz b/templates/common/tools/src/md5sum-w32_1.1.tar.gz
index bf42ec880..bf42ec880 100644
--- a/templates/iso/tools/src/md5sum-w32_1.1.tar.gz
+++ b/templates/common/tools/src/md5sum-w32_1.1.tar.gz
diff --git a/templates/iso/tools/unz512x3.exe b/templates/common/tools/unz512x3.exe
index e8b36c833..e8b36c833 100644
--- a/templates/iso/tools/unz512x3.exe
+++ b/templates/common/tools/unz512x3.exe