From d302f1bd5d1d472f60144685a054c2b5f819cc0b Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Sun, 19 Feb 2012 18:29:39 +0200 Subject: [PATCH] pandora-first-run-wizard: add hack to remove unneeded /media dirs --- recipes/pandora-system/pandora-first-run-wizard.bb | 2 +- .../pandora-first-run-wizard/first-run-wizard.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index f14e6b0..904dc4a 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 = "r27" +PR = "r28" 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 8b8fcb4..a801e3f 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 @@ -153,7 +153,7 @@ fi selection="" while [ x$selection = x ]; do -selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=310 --title="Select the Default GUI" --list --column "Name" --column "Description" --text "You can now select your preferred GUI (the GUI that will be loaded automatically on startup of the unit.\n\nYou can either select XFCE4, which is a full desktop environment (similar to a normal PC).\nOr you could select MiniMenu, which is a minimal UI similar to gaming devices.\n\nIf you select the last choice (GUISwitch), you will be prompted to choose a GUI each time you boot your Pandora.\n\nThis setting can always be changed later by running the Startup-Settings." ) +selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=310 --title="Select the Default GUI" --list --column "Name" --column "Description" --text "You can now select your preferred GUI - the GUI that will be loaded automatically on startup of the unit.\n\nYou can either select XFCE4, which is a full desktop environment (similar to a normal PC).\nOr you could select MiniMenu, which is a minimal UI similar to gaming devices.\n\nIf you select the last choice (GUISwitch), you will be prompted to choose a GUI each time you boot your Pandora.\n\nThis setting can always be changed later by running the Startup-Settings." ) if [ x$selection = x ]; then zenity --title="Error" --error --text="Please select a GUI." --timeout=6 fi @@ -229,6 +229,8 @@ update-rc.d -f blueprobe remove update-rc.d -f dropbear remove update-rc.d -f wl1251-init remove +# get rid of some dirs in /media that OE creates but are unlikely to be used +rmdir /media/card /media/cf /media/mmc1 /media/net /media/realroot /media/union 2> /dev/null # Write the control file so this script is not run on next boot # (hackish I know but I want the flexability to drop a new script in later esp. in the early firmwares). @@ -265,4 +267,4 @@ done # ---- else poweroff -fi \ No newline at end of file +fi -- 2.39.5