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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit ea08bb4de987ae604ff053c443da6594f32c2443
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 8 14:39:45 2009 +0100

    mv wifi configuration to task WIFI
    
    The wpa-supplicant setup is currently performed within
    the regular configuration target. This seemed wrong.
    It is now moved under the task WIFI where also wicd
    is installed.

diff --git a/install.sh b/install.sh
index 5bd984d..2a7fc49 100755
--- a/install.sh
+++ b/install.sh
@@ -71,9 +71,9 @@ fi
 
 # general variables
 VERSION=1.1
-TESTHOST=www.debian.org
-RDATEHOST=ntp.fu-berlin.de
-WPA_SUPPLICANT_CONF=/etc/wpa_supplicant/wpa_supplicant.conf
+TESTHOST=${TESTHOST:-www.debian.org}
+RDATEHOST=${RDATEHOST:-ntp.fu-berlin.de}
+WPA_SUPPLICANT_CONF=${WPA_SUPPLICANT_CONF:-/etc/wpa_supplicant/wpa_supplicant.conf}
 DROPBEAR_KEYS="/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_dss_host_key"
 
 # internal variables
@@ -221,8 +221,15 @@ ENVIRONMENT
                      (set to '$QI')
 	QI_VERBOSE_BOOT  set this to true if you want to see the kernel messages 
                      do this only when QI=true (set to '$QI_VERBOSE_BOOT')
+	RDATEHOST    machine with which to sync against with ntp (set to $RDATEHOST)
 	SINGLE_PART  set this to true if only one partition should be created
                      this is true by default for QI=true and false if SD_PART1_FS=vfat
+                     (set to '$SINGLE_PART')
+	TESTHOST     name of machine that should be tested for availability
+                     (set to '$TESTHOST')
+	WPA_SUPPLICANT_CONF
+                     local configuration which to transfer to neo
+                     (set to '$WPA_SUPPLICANT_CONF')
 
     Stages:
 
@@ -255,7 +262,7 @@ ENVIRONMENT
                               moment)
                        PHONE  zhone (always selected)
                        WEB    midori
-                       WIFI   wicd
+                       WIFI   wicd and transfer of local wpa configuration
                      To specify the tasks shall be assigned to the TASKS
                      environment variable as a comma separated list.
 	configuration    Configures various parts of the system, such as
@@ -783,6 +790,14 @@ action_tasks () {
 		case "$intern_task" in
 		  "WIFI")
 			#sed -i '/^exec/iif [ -x /usr/bin/wicd-client ]; then wicd-client --no-animate &; fi' "$INST_DIR/root/.xsession"
+
+			if [ -f "$WPA_SUPPLICANT_CONF" ]; then
+				echo " * Installing wpasupplicant, wireless-tools and udhcpc"
+				chroot "$INST_DIR" apt-get $APT_OPTIONS install wpasupplicant wireless-tools udhcpc
+				echo " * $WPA_SUPPLICANT_CONF copied from this machine"
+				cat > "$INST_DIR$WPA_SUPPLICANT_CONF" <$WPA_SUPPLICANT_CONF
+			fi
+
 			sed -i '/^exec/i#wicd-client --no-animate &' "$INST_DIR/root/.xsession"
 			echo " * Installing wicd for wifi setup"
 			if [ -r "$INST_DIR/etc/wicd/manager-settings.conf" ]; then
@@ -795,6 +810,7 @@ action_tasks () {
 			echo "wired_interface =" >> "$INST_DIR/etc/wicd/manager-settings.conf"
 			echo " * All extra activity for task '$intern_task' completed."
 			;;
+
 		  *)
 			echo " * No extra activity for task '$intern_task'."
 			;;
@@ -939,14 +955,6 @@ __END__
 	echo 'dash dash/sh string $DASH_BINSH' | chroot "$INST_DIR" debconf-set-selections
 	chroot "$INST_DIR" apt-get $APT_OPTIONS install dash
 
-
-	if [ -f "$WPA_SUPPLICANT_CONF" ]; then
-		echo " * Installing wpasupplicant, wireless-tools and udhcpc"
-		chroot "$INST_DIR" apt-get $APT_OPTIONS install wpasupplicant wireless-tools udhcpc
-		echo " * $WPA_SUPPLICANT_CONF copied from this machine"
-		cat > "$INST_DIR$WPA_SUPPLICANT_CONF" <$WPA_SUPPLICANT_CONF
-	fi
-
 	echo " * Installing /root/.xsession"
 	cat > "$INST_DIR/root/.xsession" <<EOMATCHBOX
 #!/bin/sh

-- 
Various non-packaged files