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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit de8cc4664e6240ceba096ce21d8df8faa1faefb9
Author: Steven De Herdt <steven.deherdt at gmail.com>
Date:   Fri Mar 5 18:02:13 2010 +0100

    Committed contribution by Steven De Herdt

diff --git a/install.sh b/install.sh
index f4430cb..de5e22e 100755
--- a/install.sh
+++ b/install.sh
@@ -96,7 +96,7 @@ intern_no_partitioning=""
 CDEBOOTSTRAP_FLAVOUR=minimal
 DEBOOTSTRAP_VARIANT=minbase
 CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.5_armel.deb
-DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.15_all.deb
+DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.22_all.deb
 CDEBOOTSTRAP_EXTRA_PACKAGES=
 DEBOOTSTRAP_EXTRA_PACKAGES=install-info
 # This gets passed to boot strappers. currently not used
@@ -1595,7 +1595,13 @@ action_cleanup () {
 	echo "I: Cleaning the environment"
 
 	echo " * Remove additional packages"
-	chroot "$INST_DIR" apt-get --yes --purge remove cdebootstrap-helper-rc.d xserver-xorg-input-synaptics
+	DELENDA=''
+	for i in	 cdebootstrap-helper-rc.d xserver-xorg-input-synaptics carthago; do
+		if dpkg -s $i > /dev/null 2> /dev/null; then
+			DELENDA=$DELENDA' '$i
+		fi
+	done
+	chroot "$INST_DIR" apt-get --yes --purge remove $DELENDA
 
 	echo " * Cleaning APT cache"
 	chroot "$INST_DIR" apt-get clean
@@ -1639,18 +1645,27 @@ action_unmount () {
 			echo "W: Could not remove directory '$INST_DIR'."
 			echo
 		fi
-
+		
+		if [ "$SINGLE_PART" = "true" ]; then
+			FSTABLINES="${SD_DEVICE}p1  $INST_DIR  auto  defaults,async  0  0"
+			LINE_OR_LINES="line"
+		else
+			FSTABLINES="${SD_DEVICE}p1  $INST_DIR/boot  auto  defaults,async  0  0
+${SD_DEVICE}p2  $INST_DIR  auto  defaults,async  0  0"
+			LINE_OR_LINES="lines"
+		fi
+		
 		cat <<EOINSTRUCTIONS
 
-The directory '$INST_DIR' to which Debian was installed
-is not available any longer. You may want to consider to
-recreate the directory '$INST_DIR' with
+The partition on which Debian was installed is no
+longer mounted. You may want to consider to recreate
+the directory '$INST_DIR' (if necessary) with
 
-mkdir "$INST_DIR"
+if [ ! -d $INST_DIR ]; then mkdir "$INST_DIR"; fi
 
-and add the line
+and add the $LINE_OR_LINES
 
-/dev/mmcblk0p2  $INST_DIR  auto  defaults,async  0  0
+$FSTABLINES
 
 to the file /etc/fstab, so it will be mounted with subsequent
 boots into the current system.

-- 
Various non-packaged files