[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 692230b9ff577c43e203a6688561212bc98ad6cb

[Luca Capello]

The following commit has been merged in the master branch:
commit 692230b9ff577c43e203a6688561212bc98ad6cb
Author: Luca Capello <luca at pca.it>
Date:   Wed May 13 17:29:52 2009 +0200

    install.sh: new cleanup stage
    
    Previously, the unmount stage could not be completed because nodm
    (and other services like dbus) where started in the chroot.  This
    behavior can be controlled by /usr/sbin/policy-rc.d.  Since
    cdebootstrap provides it the cdebootstrap-helper-rc.d, remove
    this package only at the end of the whole process.

diff --git a/install.sh b/install.sh
index 552ac6e..327a31b 100755
--- a/install.sh
+++ b/install.sh
@@ -276,8 +276,9 @@ ENVIRONMENT
     Stages:
 
 	all          Runs all the stages in the following order:
-                                testing time partition format mount debian
-                                apt fso configuration kernel tasks unmount
+                                testing time partition format mount
+                                debian apt fso configuration kernel
+                                tasks cleanup unmount
 	testing      Verifys that everything is in place for this
                      installer to work
 	time         Fetches the current time from $RDATEHOST via rdate
@@ -318,6 +319,7 @@ ENVIRONMENT
                      the X server
 	kernel       Downloads and installs the Debian kernel package
                      (only when $SD_PART1_FS is set to ext2)
+	cleanup      Remove unnecessary package and clean APT cache
 	unmount      Unmounts the Debian filesystem mounted at '$INST_DIR'
 
     Unsupported or buggy stages, use at your own risk:
@@ -818,12 +820,8 @@ __END__
 	echo " * Installing pkg-fso keyring"
 	chroot $INST_DIR apt-get $APT_OPTIONS install pkg-fso-keyring
 
-	echo " * Removing additional packages"
-	chroot "$INST_DIR" /bin/sh -e <<__END_CHROOT__
-apt-get update
-apt-get --yes --purge remove cdebootstrap-helper-rc.d
-apt-get clean
-__END_CHROOT__
+	echo " * Cleaning APT cache"
+	chroot $INST_DIR apt-get clean
 
 	echo "I: APT configured"
 }
@@ -1299,6 +1297,22 @@ __END_CHROOT__
 }
 
 #
+# Stage cleaunp
+#
+action_cleanup () {
+
+	echo "Cleaning the environment"
+
+	echo " * Remove additional packages"
+	chroot $INST_DIR apt-get --yes --purge remove cdebootstrap-helper-rc.d
+
+	echo " * Cleaning APT cache"
+	chroot $INST_DIR apt-get clean
+
+	echo "I: the environment is now clean!"
+}
+
+#
 # Stage unmount
 #
 action_unmount () {
@@ -1441,6 +1455,7 @@ do
 				action_tasks
 			fi
 			action_kernel
+			action_cleanup
 			action_unmount
 			;;
 		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks")

-- 
Various non-packaged files