[Debian-live-changes] r981 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-08 09:36:44 +0000 (Sun, 08 Apr 2007)
New Revision: 981

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_net
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-07 22:48:04 UTC (rev 980)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-08 09:36:44 UTC (rev 981)
@@ -1,5 +1,10 @@
 2007-04-08  Daniel Baumann  <daniel at debian.org>
 
+	* helpers/lh_binary_net:
+	  - Added check for namespace collision with LIVE_SERVER_PATH.
+
+2007-04-07  Daniel Baumann  <daniel at debian.org>
+
 	* helpers/lh_chroot_sources:
 	  - Moved check for local source lists from
 	    config/sources.lists.{build,image} to

Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net	2007-04-07 22:48:04 UTC (rev 980)
+++ dists/trunk/live-helper/helpers/lh_binary_net	2007-04-08 09:36:44 UTC (rev 981)
@@ -56,6 +56,11 @@
 		fi
 
 		# Creating image file
+		if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ]
+		then
+			mv chroot chroot.tmp
+		fi
+
 		mv binary "`basename ${LIVE_SERVER_PATH}`"
 
 		cd ..
@@ -65,6 +70,11 @@
 
 		mv "`basename ${LIVE_SERVER_PATH}`" binary
 
+		if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ]
+		then
+			mv chroot.tmp chroot
+		fi
+
 		# Creating stage file
 		Create_stagefile .stage/binary_net
 	fi