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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 0a9853a45b0634eb1ece192b0d6138351916c8b7
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Sep 20 13:00:12 2009 +0200

    Bringing cdebootstrap back to life.

diff --git a/install.sh b/install.sh
index bb74a0c..dcc2785 100755
--- a/install.sh
+++ b/install.sh
@@ -895,13 +895,28 @@ action_debian () {
 	fi
 
 	echo " * Downloading bootstrapper package '`basename $intern_bootstrapper_package`'"
-
+        if [ -n "$VERBOSE" ]; then echo "   from $intern_bootstrapper_package"; fi
 	internal_localpackagename=/tmp/debootstrapOrCdebootstrap.deb
 	wget $intern_bootstrapper_package -O "$internal_localpackagename"
 	rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
-	( cd /tmp && ar -x "$internal_localpackagename" data.tar.gz )
+	(
+		cd /tmp
+		if ! ar -x "$internal_localpackagename" data.tar.gz ; then
+			echo "E: Could not extract files from .deb for bootstrapper '$BOOTSTRAPER'."
+			exit 1
+		else
+			echo "I: Successfully extracted files from bootstrapper's .deb."
+		fi
+	)
 	rm -f "$internal_localpackagename"
-	$TAR_APPLICATION -xz -C / -f /tmp/data.tar.gz
+	intern_taroptions=
+	if [ -n "$VERBOSE" ]; then intern_taroptions="${intern_taroptions}v"; fi
+	if ! $TAR_APPLICATION -x${intern_taroptions}z -C / -f /tmp/data.tar.gz; then
+		echo "E: Could not untar binaries for bootstrapper from /tmp/data.tar.gz"
+		exit 1
+	else
+		echo "I: Successfully extracted binaries for bootstapper."
+	fi
 	rm -f /tmp/data.tar.gz
 
 	echo " * Running '$BOOTSTRAPPER' to install the system (might take a while)"
@@ -920,7 +935,7 @@ action_debian () {
 	fi
 
 	if [ "cdebootstrap" = "$BOOTSTRAPPER" ]; then
-		cdebootstrap $CDEBOOTSTRAP_EXTRA_FLAGS --allow-unauthenticated --flavour $CDEBOOTSTRAP_FLAVOUR \
+		cdebootstrap-static $CDEBOOTSTRAP_EXTRA_FLAGS --allow-unauthenticated --flavour $CDEBOOTSTRAP_FLAVOUR \
 			--exclude=$BOOTSTRAP_EXCLUDE_PACKAGES \
 			--include=$CDEBOOTSTRAP_EXTRA_PACKAGES \
 			sid "$INST_DIR" $INST_MIRROR

-- 
Various non-packaged files