[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 a4694dfd26bbf16785e80a5fa8e2550a0f09a36d
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 8 22:43:57 2009 +0100

    WPA-Supplicant configuration no longer copied.

diff --git a/install.sh b/install.sh
index e20eb36..4a94711 100755
--- a/install.sh
+++ b/install.sh
@@ -74,7 +74,6 @@ VERSION=1.1
 VERBOSE=${VERBOSE:-}
 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
@@ -99,7 +98,7 @@ PACKAGES_TASK_GAMES="mokomaze sgt-puzzles"
 PACKAGES_TASK_GPS="tangogps"
 PACKAGES_TASK_PHONE="zhone"
 PACKAGES_TASK_WEB="midori"
-PACKAGES_TASK_WIFI="wpasupplicant wireless-tools udhcpc"
+PACKAGES_TASK_WIFI="dhcp3-client wpasupplicant wireless-tools"
 
 # device-specific values
 UBOOT_ENV_SIZE=262144
@@ -230,9 +229,6 @@ ENVIRONMENT
 	TESTHOST     name of machine that should be tested for availability
                      (set to '$TESTHOST')
 	VERBOSE      increase amount of information that is forwarded to stdout
-	WPA_SUPPLICANT_CONF
-                     local configuration which to transfer to neo
-                     (set to '$WPA_SUPPLICANT_CONF')
 
     Stages:
 
@@ -265,8 +261,7 @@ ENVIRONMENT
                               moment)
                        PHONE  zhone (always selected)
                        WEB    midori
-                       WIFI   wicd, udhcpc, wireless-tools, wpasupplicant
-                              and the transfer of a local wpa configuration
+                       WIFI   wicd, wireless-tools, wpasupplicant, dhcp3-client
                      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
@@ -805,12 +800,6 @@ 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 [ -r "$WPA_SUPPLICANT_CONF" ]; then
-				echo " * copying '$WPA_SUPPLICANT_CONF' from this machine"
-				cp "$WPA_SUPPLICANT_CONF" "$INST_DIR$WPA_SUPPLICANT_CONF"
-			fi
 
 			echo " * modifying .xsession to autostart wicd-client"
 			sed -i '/^exec/i#wicd-client --no-animate &' "$INST_DIR/root/.xsession"

-- 
Various non-packaged files