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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 20cfe2c6558c23ecba0a7196a58eb3a8ef22e105
Author: Steven De Herdt <steven.deherdt at gmail.com>
Date:   Mon Mar 15 00:28:38 2010 +0100

    Fixes, optimisations, better help.

diff --git a/install.sh b/install.sh
index 0bf555f..b1deab2 100755
--- a/install.sh
+++ b/install.sh
@@ -311,7 +311,8 @@ ENVIRONMENT
                      (set to '$SD_SYS_BLK', or derived from the value of SD_DEVICE)
 	SD_PART1_FS  the filesystem for the first microSD card partition,
                      i.e. the one containing the uImage.bin (set to
-                     '$SD_PART1_FS', possible values are ext2/vfat)
+                     '$SD_PART1_FS', possible values are ext2/vfat, 
+                     also ext3 when using Qi as bootloader)
 	SD_PART1_SIZE    number of megabytes for first partition (set to '$SD_PART1_SIZE')
 	SD_SWAP_SIZE     number of megabytes of swap partition (set to '$SD_SWAP_SIZE')
 	INST_DIR     the directory where the microSD card partitions
@@ -575,7 +576,7 @@ __END__
 				fi
 				;;
 			*)
-				if [ -n "$VERBOSE" ]; then echo calling '$f'; fi
+				if [ -n "$VERBOSE" ]; then echo "calling '$f'"; fi
 				action_$f
 				;;
 		esac
@@ -912,6 +913,13 @@ action_mount () {
 
 action_debian () {
 	echo "I: Install a basic Debian system"
+	
+	#For users of local apt proxy
+	mkdir -p $INST_DIR/etc
+	if [ -f /etc/hosts ]; then
+		cp /etc/hosts $INST_DIR/etc
+		echo "I: /etc/hosts copied from this machine"
+	fi	 	   
 
 	intern_bootstrapper_package=
 	if [ "cdebootstrap" = "$BOOTSTRAPPER" ]; then
@@ -1613,9 +1621,10 @@ action_cleanup () {
 
 	echo " * Remove additional packages"
 	intern_delenda=''
-	for i in	 cdebootstrap-helper-rc.d xserver-xorg-input-synaptics carthago; do
-		if dpkg -s $i > /dev/null 2> /dev/null; then
-			intern_delenda="$intern_delenda $i"
+	intern_proposed_delenda='cdebootstrap-helper-rc.d xserver-xorg-input-synaptics' #carthago'
+	for pakket in $intern_proposed_delenda; do
+		if dpkg -s $pakket > /dev/null 2> /dev/null; then
+			intern_delenda="$intern_delenda $pakket"
 		fi
 	done
 	chroot "$INST_DIR" apt-get --yes --purge remove $intern_delenda

-- 
Various non-packaged files