# HG changeset patch # User Eric Joseph-Alexandre # Date 1265324139 -3600 # Node ID a75cf5dd7f62bf89f383f6b28ab756e4bf707451 # Parent 907333e26d533c8824e3ffe9b7623a9a75163b96 hal: Fix reboot issue with Xfce. diff -r 907333e26d53 -r a75cf5dd7f62 hal/receipt --- a/hal/receipt Thu Feb 04 23:33:54 2010 +0100 +++ b/hal/receipt Thu Feb 04 23:55:39 2010 +0100 @@ -27,6 +27,7 @@ { cd $src zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && + patch -p1 < ../stuff/hal-scripts.u || exit 1 && #patch -p1 < ../stuff/hal-udev.patch || exit 1 && ./configure \ --prefix=/usr \ diff -r 907333e26d53 -r a75cf5dd7f62 hal/stuff/hal-scripts.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hal/stuff/hal-scripts.u Thu Feb 04 23:55:39 2010 +0100 @@ -0,0 +1,21 @@ +--- hal-0.5.13.ori/tools/linux/hal-system-power-reboot-linux Sun Aug 10 15:50:10 2008 ++++ hal-0.5.13/tools/linux/hal-system-power-reboot-linux Thu Feb 4 23:41:04 2010 +@@ -1,4 +1,6 @@ + #!/bin/sh ++# 2010-02-04 erjo@slitaz.org ++# * Use reboot first for Busybox. + + unsupported() { + echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2 +@@ -7,7 +9,10 @@ + } + + #Try for common tools +-if [ -x "/sbin/shutdown" ] ; then ++if [ -x "/sbin/reboot" ] ; then ++ /sbin/reboot ++ exit $? ++elif [ -x "/sbin/shutdown" ] ; then + /sbin/shutdown -r now + exit $? + elif [ -x "/usr/sbin/shutdown" ] ; then