From: Michael Mrozek Date: Mon, 10 Oct 2011 23:03:39 +0000 (+0200) Subject: op_power.sh: Fixed shutdown loop X-Git-Tag: sz_beta3~73 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d42961769ecea2dcbdeadc4a6d733f9a8983eb8;p=openpandora.oe.git op_power.sh: Fixed shutdown loop --- diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index 41062ac..4e5a6a6 100644 --- a/recipes/pandora-system/pandora-scripts.bb +++ b/recipes/pandora-system/pandora-scripts.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" DEPENDS = "zenity dbus" RDEPENDS = "zenity dbus" -PR = "r76" +PR = "r77" SRC_URI = " \ file://op_bright.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_power.sh b/recipes/pandora-system/pandora-scripts/op_power.sh index b422d92..70bac83 100644 --- a/recipes/pandora-system/pandora-scripts/op_power.sh +++ b/recipes/pandora-system/pandora-scripts/op_power.sh @@ -89,7 +89,7 @@ shutdown(){ # warns the user and shuts the pandora down } countdown | su -c 'DISPLAY=:0.0 zenity --progress --auto-close --text "Shutdown in X" --title "Shutdown"' $xfceuser if [ $? -eq 0 ]; then - shutdown -h now + /sbin/shutdown -h now else su -c 'DISPLAY=:0.0 zenity --error --text "Shutdown aborted!"' $xfceuser fi