From 31f1424f6654c1f05841f59c4d13d526d192a1cd Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Sat, 3 Jul 2010 03:58:33 +0200 Subject: [PATCH] first-run-wizard: Fixed problem that the First Boot Wizard hangs when you don't select a GUI --- recipes/pandora-system/pandora-first-run-wizard.bb | 2 +- .../pandora-first-run-wizard/first-run-wizard.sh | 9 +++++++-- recipes/pandora-system/pandora-libpnd.bb | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index f157bc7..d7c6148 100755 --- a/recipes/pandora-system/pandora-first-run-wizard.bb +++ b/recipes/pandora-system/pandora-first-run-wizard.bb @@ -6,7 +6,7 @@ RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrat COMPATIBLE_MACHINE = "omap3-pandora" -PR = "r16" +PR = "r17" SRC_URI = " \ file://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 dae3efb..26f3102 100755 --- 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=$(zenity --width=500 --height=300 --title="Select the Default GUI" --list --column "Name" --column "Description" --text "Please select the Default GUI" Test1 Desc1 Test2 Desc2 ) +if [ x$selection = x ]; then zenity --title="Error" --error --text="Please select a GUI." --timeout=6 +fi done echo $selection diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb index 3592275..81c490b 100755 --- a/recipes/pandora-system/pandora-libpnd.bb +++ b/recipes/pandora-system/pandora-libpnd.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)" LICENSE = "lGPL" -PR = "r21" +PR = "r22" PARALLEL_MAKE = "" @@ -14,7 +14,7 @@ SRC_URI = " \ file://op_pnd_run.desktop \ " -SRCREV = "a982cbab3f43e0119e8dd8bfcd6c057dcefb0b35" +SRCREV = "f9cd6ce6975660d5378dc528e19b3ea6688f99e6" S = "${WORKDIR}/git" -- 2.39.2