From 0d5ff4ca7596790f853cf637e0fe225cad810a76 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:14 +0200
Subject: Adding live-helper 1.0~a18-1.

---
 helpers/lh_binary_linux-image | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

(limited to 'helpers/lh_binary_linux-image')

diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 153e476e3..b4cee2eb6 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -46,9 +46,6 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
@@ -92,34 +89,14 @@ case "${LIVE_ARCHITECTURE}" in
 		;;
 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
+Check_multiarchitecture
 
 # Creating directory
 mkdir -p "${DESTDIR}"
 
 # Installing linux-image
-cp chroot/boot/"${LINUX}"* "${DESTDIR}"
-cp chroot/boot/initrd.img* "${DESTDIR}"
+cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
+cp chroot/boot/initrd.img-* "${DESTDIR}"
 
 # Creating stage file
 Create_stagefile .stage/binary_linux-image
-- 
cgit v1.2.3