[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-12-g4668d44

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 4668d4409179f3e7664f8c7636521141da2c986b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 14 17:40:43 2009 +0100

    Correcting path within netboot tarballs.

diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 95c9f54..3e962c4 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -130,33 +130,33 @@ then
 	mv binary ${ROOT_DIR}
 fi
 
-cd ..
+mkdir binary.tmp
+mv ${ROOT_DIR} tftpboot binary.tmp
+cd binary.tmp
 
 case "${LH_NET_TARBALL}" in
 	bzip2)
-		tar cfj binary-net-tar.bz2 "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot"
-		mv binary-net.tar.bz2 "${OLDPWD}"
+		tar cfj ../binary-net-tar.bz2 *
 		;;
 
 	gzip)
 		if gzip --help | grep -qs "\-\-rsyncable"
 		then
-			tar cf binary-net.tar "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot"
-			gzip --rsyncable --best binary-net.tar
+			tar cf ../binary-net.tar *
+			gzip --rsyncable --best ../binary-net.tar
 		else
-			tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot"
+			tar cfz ../binary-net.tar.gz *
 		fi
-
-		mv binary-net.tar.gz "${OLDPWD}"
 		;;
 
 	tar)
-		tar cf binary-net.tar "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot"
-		mv binary-net.tar "${OLDPWD}"
+		tar cf ../binary-net.tar *
 		;;
 esac
 
+mv * ../
 cd "${OLDPWD}"
+rmdir binary.tmp
 
 if [ "${ROOT_DIR}" != "binary" ]
 then

-- 
Debian Live build scripts