From 2230835b694fef8f6f63992b373d06e6025917ce Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:50 +0200
Subject: Adding live-helper 1.0~a6-1.

---
 helpers/lh_binary_includes | 59 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 13 deletions(-)

(limited to 'helpers/lh_binary_includes')

diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index e343d724d..18ad540e8 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -41,15 +41,15 @@ Breakpoint "binary_includes: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
 # Check includes
 if [ ! -d "${LIVE_INCLUDES}" ]
 then
@@ -62,18 +62,51 @@ then
 	fi
 fi
 
-if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
-then
-	cd "${LIVE_INCLUDES}"/common
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-fi
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		ARCH="amd"
+		;;
+
+	i386)
+		ARCH="386"
+		;;
 
-if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
+	powerpc)
+		ARCH="ppc"
+		;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
 then
-	cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
+	# Copying d-i templates
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+	then
+		cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+	fi
+
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+	then
+		cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+	fi
+
+	# Adjusting d-i templates
+	DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+	then
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
+	else
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+		DEBIAN_TOOLS_TXT="/tools/"
+	fi
+
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_TXT}/g" binary/README.txt
 fi
 
 # Creating stage file
-- 
cgit v1.2.3