[Debian-live-changes] r1061 - in dists/trunk/live-helper: helpers hooks

[Daniel Baumann]

Author: daniel
Date: 2007-04-15 16:09:03 +0000 (Sun, 15 Apr 2007)
New Revision: 1061

Modified:
   dists/trunk/live-helper/helpers/lh_chroot_sources
   dists/trunk/live-helper/hooks/mini
   dists/trunk/live-helper/hooks/minimal
Log:


Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-15 15:26:35 UTC (rev 1060)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-15 16:09:03 UTC (rev 1061)
@@ -57,7 +57,7 @@
 
 		if [ "${LIVE_SECURITY}" = "enabled" ]
 		then
-			if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" = "unstable" ]
+			if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
 			then
 				echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
@@ -103,7 +103,7 @@
 		fi
 
 		# Installing aptitude
-		if [ "${LH_APT}" = "apt" ]
+		if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ]
 		then
 			Chroot "apt-get update"
 		elif [ "${LH_APT}" = "aptitude" ]

Modified: dists/trunk/live-helper/hooks/mini
===================================================================
--- dists/trunk/live-helper/hooks/mini	2007-04-15 15:26:35 UTC (rev 1060)
+++ dists/trunk/live-helper/hooks/mini	2007-04-15 16:09:03 UTC (rev 1061)
@@ -15,6 +15,8 @@
 apt-get remove --purge --yes ssl wget
 
 # Removing unused files
+find . -name *~ | xargs rm -f
+
 rm -rf /usr/include/*
 #rm -rf /usr/share/groff/*
 rm -rf /usr/share/doc/*

Modified: dists/trunk/live-helper/hooks/minimal
===================================================================
--- dists/trunk/live-helper/hooks/minimal	2007-04-15 15:26:35 UTC (rev 1060)
+++ dists/trunk/live-helper/hooks/minimal	2007-04-15 16:09:03 UTC (rev 1061)
@@ -15,6 +15,8 @@
 apt-get remove --purge --yes ssl wget
 
 # Removing unused files
+find . -name *~ | xargs rm -f
+
 rm -rf /var/cache/man/*
 
 # Cleaning apt