[Debian-live-changes] r1263 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-05-05 13:54:41 +0000 (Sat, 05 May 2007)
New Revision: 1263

Modified:
   dists/trunk/live-helper/helpers/lh_binary_localincludes
   dists/trunk/live-helper/helpers/lh_binary_usb-hdd
   dists/trunk/live-helper/helpers/lh_source_usb-hdd
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_localincludes	2007-05-05 13:13:22 UTC (rev 1262)
+++ dists/trunk/live-helper/helpers/lh_binary_localincludes	2007-05-05 13:54:41 UTC (rev 1263)
@@ -53,6 +53,12 @@
 	find . | cpio -dmpu "${OLDPWD}"/binary
 	cd "${OLDPWD}"
 
+	# Removing symlinks
+	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+	then
+		find binary -type l | xargs rm -f
+	fi
+
 	# Creating stage file
 	Create_stagefile .stage/binary_localincludes
 fi

Modified: dists/trunk/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-05-05 13:13:22 UTC (rev 1262)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-05-05 13:54:41 UTC (rev 1263)
@@ -77,7 +77,7 @@
 
 		# Everything which comes here needs to be cleaned up,
 		DU_DIM="`du -ms binary | cut -f1`"
-		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
 		dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
 		FREELO="`${LH_LOSETUP} -f`"
 		if [ ! -b chroot/${FREELO} ]

Modified: dists/trunk/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-05-05 13:13:22 UTC (rev 1262)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-05-05 13:54:41 UTC (rev 1263)
@@ -70,7 +70,7 @@
 
 		# Everything which comes here needs to be cleaned up,
 		DU_DIM="`du -ms source | cut -f1`"
-		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
 		dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
 		FREELO="`${LH_LOSETUP} -f`"
 		if [ ! -b chroot/${FREELO} ]