[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 68d149398d50c734c9db76a82dd7d25894b738b4
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Feb 21 13:21:08 2009 +0100

    Announced dysfunctionality of wicd install
    
    We still need to figure out, why exactly the wicd is started upon installation
    when installed with apt-get. The now implemented approach adds wicd to the
    list of extra packakges to be installed by cdebootstrap, but this is ignored
    or for other reasons still erroneous.

diff --git a/install.sh b/install.sh
index 81df3d4..aab1136 100755
--- a/install.sh
+++ b/install.sh
@@ -213,6 +213,7 @@ ENVIRONMENT
 	WITH_WIFI    determines how to configure the wireless connections. Set
                      to 'none' will not install anything (default), 'wicd' is
                      supported as an experimental setup (set to '$WITH_WIFI').
+                     This is not yet functional.
 
     Stages:
 
@@ -256,7 +257,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
+	--with-wifi  sets the WITH_WIFI variable (experimental, not functional)
 
 BUGS
 	Only the current (second) generation of devices is supported.
@@ -608,15 +609,22 @@ rm -f /tmp/cdebootstrap.deb
 	case "$WITH_WIFI" in
 	  "wicd")
 		echo " * added wicd to list of packages to install"
+		echo
+		echo "   W: You have selected the option --with-wifi wicd"
+		echo "      which is still under development. Please don't"
+		echo "      expect it to work, you will have to manually"
+		echo "      install the wicd package after booting into"
+		echo "      the system."
+		echo
 		CDEBOOTSTRAP_EXTRA_PACKAGES=$CDEBOOTSTRAP_EXTRA_PACKAGES,wicd
-		CDEBOOTSTRAP_FLAVOUR=build
+		#CDEBOOTSTRAP_FLAVOUR=build
 		;;
 	  "none")
 		if [ -n "$VERBOSE" ]; then echo "* support for wifi left for manual installation"; fi
 		;;
 	  *)
 		echo
-		echo "Unsupported Wifi: '$WITH_WIFI'"
+		echo "Unsupported Wifi: '$WITH_WIFI'."
 		echo
 		exit 1
 		;;

-- 
Various non-packaged files