first-run-wizard: Fixed the fix. I really need to get some sleep :(

[openpandora.oe.git] / recipes / pandora-system / pandora-first-run-wizard / first-run-wizard.sh

diff --git a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
index 0b3cb19..48a922f 100755 (executable)
--- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@ -124,7 +124,8 @@ done
 
 
 echo $hostname > /etc/hostname
-sed 's/ /_/g' /etc/hostname
+hostname =$(sed 's/ /_/g' /etc/hostname)
+echo $hostname > /etc/hostname
 echo "127.0.0.1 localhost.localdomain localhost $hostname" > /etc/hosts
 hostname -F /etc/hostname
 
@@ -148,8 +149,12 @@ fi
 
 # Select the default interface and setup SLiM to pass that as a sesion to ~./.xinitrc
 
-while ! selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=300 --title="Select the Default GUI" --list --column "Name" --column "Description" --text "Please select the Default GUI" ); do
+selection=""
+while [ x$selection = x ]; do
+selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=300 --title="Select the Default GUI" --list --column "Name" --column "Description" --text "Please select the Default GUI" )
+if [ x$selection = x ]; then
   zenity --title="Error" --error --text="Please select a GUI." --timeout=6
+fi
 done
 
 echo $selection
@@ -213,16 +218,16 @@ zenity --info --title="Finished" --text "This concludes the First Boot Wizard.\n
 
 # NOTE: This is just a temporary fix! These daemons should be removed from startup in the OE recipes. Until the time is found, we'll do it from here.
 update-rc.d -f samba remove
-update-rc.d -f xinetd
-update-rc.d -f avahi-daemon
-update-rc.d -f apmd
-update-rc.d -f usb-gadget
-update-rc.d -f banner
-update-rc.d -f portmap
-update-rc.d -f mountnfs
-update-rc.d -f blueprobe
-update-rc.d -f dropbear
-update-rc.d -f wl1251-init
+update-rc.d -f xinetd remove
+update-rc.d -f avahi-daemon remove
+update-rc.d -f apmd remove
+update-rc.d -f usb-gadget remove
+update-rc.d -f banner remove
+update-rc.d -f portmap remove
+update-rc.d -f mountnfs remove
+update-rc.d -f blueprobe remove
+update-rc.d -f dropbear remove
+update-rc.d -f wl1251-init remove
 
 
 # Write the control file so this script is not run on next boot