[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-4-g5beddcc

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 5beddccdc7332ba018c6df4f39f1d4c6af487b61
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 2 21:12:36 2010 +0200

    Adding special hack to prevent samhain from initializing.

diff --git a/helpers/chroot_dpkg b/helpers/chroot_dpkg
index 3b5f00b..c7cf38e 100755
--- a/helpers/chroot_dpkg
+++ b/helpers/chroot_dpkg
@@ -52,6 +52,17 @@ EOF
 
 		chmod 755 chroot/sbin/start-stop-daemon
 
+		# Manual hacks for special packages
+
+		# samhain
+		if [ -e /var/state/samhain/samhain_file ]
+		then
+			mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
+		else
+			mkdir -p /var/state/samhain
+			touch /var/state/samhain/samhain_file
+		fi
+
 		# Creating stage file
 		Create_stagefile .stage/chroot_dpkg
 		;;
@@ -65,6 +76,17 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
+		# Manual hacks for special packages
+
+		# samhain
+		if [ -e /var/state/samhain/samhain_file.orig ]
+		then
+			mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
+		else
+			rm -f /var/state/samhain/samhain_file
+			rmdir --ignore-fail-on-non-empty /var/state/samhain
+		fi
+
 		# Restore start-stop-daemon program
 		if [ -e chroot/sbin/start-stop-daemon.orig ]
 		then

-- 
live-helper