Adding live-helper 1.0~a3-1.

1 files changed, 16 insertions, 17 deletions

diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index e61d160e3..a0f5b8aa5 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -1,6 +1,11 @@
 #!/bin/sh
 
 # lh_chroot_packages(1) - install packages into chroot
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper 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
 
@@ -10,6 +15,13 @@ do
 	. ${FUNCTION}
 done
 
+# Set static variables
+DESCRIPTION="install packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -30,11 +42,8 @@ Create_lockfile .lock
 
 if [ -n "${LIVE_PACKAGES}" ]
 then
-	# Restore old cache
-	if [ -d cache/chroot ]
-	then
-		cp cache/chroot_packages/*.deb chroot/var/cache/apt/archives
-	fi
+	# Restoring cache
+	Restore_cache cache/chroot_packages
 
 	# Installing packages
 	case "${LH_APT}" in
@@ -47,18 +56,8 @@ then
 			;;
 	esac
 
-	# Saving new cache
-	Chroot "apt-get autoclean"
-
-	if ls chroot/var/cache/apt/archives/*.deb &> /dev/null
-	then
-		if [ ! -d cache/chroot_packages ]
-		then
-			mkdir -p cache/chroot_packages
-		fi
-
-		mv -f chroot/var/cache/apt/archives/*.deb cache/chroot_packages
-	fi
+	# Saving cache
+	Save_cache cache/chroot_packages
 
 	# Creating stage file
 	Create_stagefile .stage/chroot_packages