[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 7fa3000e1fd4b801eaa143e1ac5c59b2d361441f
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 8 19:36:55 2009 +0100

    Further smoothing of wifi setup

diff --git a/install.sh b/install.sh
index 2a7fc49..4e75e3c 100755
--- a/install.sh
+++ b/install.sh
@@ -98,6 +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"
 
 # device-specific values
 UBOOT_ENV_SIZE=262144
@@ -262,7 +263,8 @@ ENVIRONMENT
                               moment)
                        PHONE  zhone (always selected)
                        WEB    midori
-                       WIFI   wicd and transfer of local wpa configuration
+                       WIFI   wicd, udhcpc, wireless-tools, wpasupplicant
+                              and the transfer of a 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
@@ -791,13 +793,12 @@ action_tasks () {
 		  "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
+			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"
 			echo " * Installing wicd for wifi setup"
 			if [ -r "$INST_DIR/etc/wicd/manager-settings.conf" ]; then
@@ -808,6 +809,7 @@ action_tasks () {
 				echo "[Settings]" >> "$INST_DIR/etc/wicd/manager-settings.conf"
 			fi
 			echo "wired_interface =" >> "$INST_DIR/etc/wicd/manager-settings.conf"
+			chroot "$INST_DIR" apt-get install wicd
 			echo " * All extra activity for task '$intern_task' completed."
 			;;
 

-- 
Various non-packaged files