[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.4-1-1-g6eccacc

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 6eccacce392df0a1b3ee5c9030a5442ee914f567
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Oct 28 09:40:35 2010 +0200

    Removing dpkg-tmpfs hack, this is too intrusive atm.

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 09e1875..aedfc5f 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -42,7 +42,6 @@ lb chroot_selinuxfs install ${*}
 lb chroot_sysfs install ${*}
 lb chroot_debianchroot install ${*}
 lb chroot_dpkg install ${*}
-lb chroot_dpkg_tmpfs install ${*}
 lb chroot_sysv-rc install ${*}
 lb chroot_upstart install ${*}
 lb chroot_hosts install ${*}
@@ -80,7 +79,6 @@ lb chroot_resolv remove ${*}
 lb chroot_hosts remove ${*}
 lb chroot_sysv-rc remove ${*}
 lb chroot_upstart remove ${*}
-lb chroot_dpkg_tmpfs remove ${*}
 lb chroot_dpkg remove ${*}
 lb chroot_debianchroot remove ${*}
 lb chroot_sysfs remove ${*}
diff --git a/scripts/build/lb_chroot_dpkg_tmpfs b/scripts/build/lb_chroot_dpkg_tmpfs
deleted file mode 100755
index db3b8bf..0000000
--- a/scripts/build/lb_chroot_dpkg_tmpfs
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /var/lib/dpkg')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring tmpfs for /var/lib/dpkg"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_dpkg_tmpfs
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		mv chroot/var/lib/dpkg chroot/var/lib/dpkg.tmp
-		mkdir chroot/var/lib/dpkg
-		mount -t tmpfs tmpfs chroot/var/lib/dpkg
-		mv chroot/var/lib/dpkg.tmp/* chroot/var/lib/dpkg
-		rm -rf chroot/var/lib/dpkg.tmp
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_dpkg_tmpfs
-		;;
-
-	remove)
-		Echo_message "Deconfiguring tmpfs for /var/lib/dpkg"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		mkdir -p chroot/var/lib/dpkg.tmp
-		mv chroot/var/lib/dpkg/* chroot/var/lib/dpkg.tmp
-		umount chroot/var/lib/dpkg
-		rm -rf chroot/var/lib/dpkg
-		mv chroot/var/lib/dpkg.tmp chroot/var/lib/dpkg
-
-		# Removing stage file
-		rm -f .stage/chroot_dpkg_tmpfs
-		;;
-
-	*)
-		Usage
-		;;
-esac

-- 
live-build