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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 8607811e94283efa916ecf55fd3f9c715ba8f52f
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Feb 20 02:03:09 2009 +0100

    wicd auto-install
    
    A very first test to learn about how the preparation of the wicd for Debian might possibly work.

diff --git a/install.sh b/install.sh
index a24f09b..2200e8c 100755
--- a/install.sh
+++ b/install.sh
@@ -54,6 +54,7 @@ FSO_DEVICE=${FSO_DEVICE:-gta02}
 QI=${QI:-false}
 QI_VERBOSE_BOOT=${QI_VERBOSE_BOOT:-false}
 SINGLE_PART=${SINGLE_PART:-$QI}
+WITH_WIFI=${WITH_WIFI:-none}
 
 # hardening for the case that a user uses capitals
 lc SD_PART1_FS SD_PART2_FS APT_RECOMMENDS QI QI_VERBOSE_BOOT FSO_DEVICE
@@ -205,6 +206,9 @@ DESCRIPTION
                      do this only when QI=true (default to false)
 	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
+	WITH_WIFI    determines how to configure the wireless connections. Set
+                     to 'none' will not install anything (default), 'wicd' is
+                     supported as an experimental setup.
 
     Stages:
 
@@ -248,6 +252,7 @@ OPTIONS
 	--part1-fs   sets the SD_PART1_FS variable
 	--part1-size sets the SD_PART1_SIZE variable
 	--swap-size  sets the SD_SWAP_SIZE variable
+	--with-wifi  sets the WITH_WIFI variable
 
 BUGS
 	Only the current (second) generation of devices is supported.
@@ -788,6 +793,37 @@ echo " * Installing dash as /bin/sh: $DASH_BINSH"
 echo 'dash dash/sh string $DASH_BINSH' | chroot $INST_DIR debconf-set-selections
 chroot $INST_DIR apt-get --yes --force-yes install dash
 
+case "$WITH_WIFI" in
+ "wicd")
+	echo " * Installing wicd for wifi setup"
+	if [ -r "$INST_DIR/etc/wicd/manager-settings.conf" ]; then
+		echo "The file /etc/wicd/manager-settings.conf is already existing. This is not expected. Exiting."
+		echo "Please report to pkg-fso-maint at lists.alioth.debian.org."
+		exit 1
+	else
+		echo "wired_interface =" >> $INST_DIR/etc/wicd/manager-settings.conf
+	fi
+
+	if ! chroot $INST_DIR apt-get --yes install wicd; then
+		echo
+		echo "The installation of wicd has failed. This is probably ignorable."
+		echo "Please report nonetheless to pkg-fso-maint at lists.alioth.debian.org."
+		echo
+		echo "The installation continues."
+		echo
+	fi
+	sed -i '/^exec/iwicd-client --no-animate &' $INST_DIR/root/.xsession
+	;;
+ "none")
+	# no installation to be performed
+	;;
+ *)
+	echo
+	echo "Unsupported Wifi: '$WITH_WIFI'"
+	echo
+	;;
+esac
+
 if [ -f "$WPA_SUPPLICANT_CONF" ]; then
 	echo " * Installing wpasupplicant, wireless-tools and udhcpc"
 	chroot $INST_DIR apt-get --yes install wpasupplicant wireless-tools udhcpc
@@ -1005,6 +1041,10 @@ do
 			assignNumeric="true"
 			assignVariablename="SD_SWAP_SIZE"
 			;;
+		 "--with-wifi")
+                        assignParametername="$i"
+			assignVariablename="WITH_WIFI"
+			;;
 		 "all")
 			action_testing
 			action_time

-- 
Various non-packaged files