[SCM] live-helper branch, upstream, updated. upstream/2.0_a5-1-g75cd5d0

[Daniel Baumann]

The following commit has been merged in the upstream branch:
commit 75cd5d046cf15e0f8cf8a4281f7bc59a0d72ea06
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jan 31 16:47:27 2010 +0100

    Adding upstream version 2.0~a6.

diff --git a/examples/hooks/all_chroot_sun-java6.sh b/examples/hooks/all_chroot_sun-java6.sh
index c86066f..5a75962 100755
--- a/examples/hooks/all_chroot_sun-java6.sh
+++ b/examples/hooks/all_chroot_sun-java6.sh
@@ -26,3 +26,6 @@ DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java6-bin sun-java6-demo \
 # Ensure that /tmp has the right permissions; apparently sun-java5-doc tampers
 # with it
 chmod 1777 /tmp
+
+# Set sun-java as default java
+update-alternatives --set java /usr/lib/jvm/java-6-sun/jre/bin/java
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 698dc34..f52578f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -548,7 +548,7 @@ Set_defaults ()
 		case "${LH_MODE}" in
 			debian|debian-release|embedian)
 				case "${LH_DISTRIBUTION}" in
-					lenny|squeeze)
+					lenny)
 						LH_LINUX_PACKAGES="linux-image-2.6 \${LH_UNION_FILESYSTEM}-modules-2.6"
 						;;
 
diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks
index 5c076b0..0155e79 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -40,6 +40,9 @@ Create_lockfile .lock
 # Processing local-hooks
 if Find_files config/chroot_local-hooks/*
 then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
 	for HOOK in config/chroot_local-hooks/*
 	do
 		# Copying hook
@@ -58,6 +61,9 @@ then
 		rm -f chroot/root/"$(basename ${HOOK})"
 	done
 
+	# Saving cache
+	Save_cache cache/packages_chroot
+
 	# Creating stage file
 	Create_stagefile .stage/chroot_local-hooks
 fi
diff --git a/lists/debian-forensics b/lists/debian-forensics
index 6d3ae7d..9915219 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -5,8 +5,11 @@
 
 # http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
 
-ext3grep galleta gpart grokevt memdump missidentify myrescue pasco reglookup
+galleta grokevt memdump missidentify myrescue pasco reglookup
 scrounge-ntfs sleuthkit ssdeep tableau-parm tct unhide wipe
+#if ARCHITECTURE amd64 i386
+ext3grep gpart
+#endif
 
 #if DISTRIBUTION squeeze sid
 aesfix aeskeyfind chaosreader guymager ewf-tools md5deep pipebench
diff --git a/lists/rescue b/lists/rescue
index 9acc6f2..287ced2 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -43,9 +43,11 @@ par2 dvd+rw-tools
 chiark-utils-bin
 
 # System
-dmidecode lshw pciutils procinfo usbutils mcelog
-sysstat
-cpuburn stress
+#if ARCHITECTURE amd64 i386
+dmidecode mcelog cpuburn
+#endif
+lshw pciutils procinfo usbutils
+sysstat stress
 
 #if ARCHITECTURE i386 powerpc
 read-edid
@@ -271,7 +273,10 @@ sleuthkit
 dosfstools mscompress chntpw pptpd pptp-linux
 
 # unsorted
-hwinfo x86info cpuid
+#if ARCHITECTURE amd64 i386
+cpuid x86info
+#endif
+hwinfo
 tofrodos rpncalc
 hal
 dc

-- 
live-helper