![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package hal checked in at Mon Oct 23 18:51:24 CEST 2006. -------- --- hal/hal.changes 2006-10-16 13:21:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2006-10-23 18:50:14.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 23 18:49:16 CEST 2006 - hmacht@suse.de + +- patch hal-add-pm-utils-support.diff: + call pm-utils first, then try powersave if not available +- Recommends: pm-utils + +------------------------------------------------------------------- New: ---- hal-add-pm-utils-support.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ ++++ 777 lines (skipped) ++++ between hal/hal.spec ++++ and /mounts/work_src_done/STABLE/hal/hal.spec ++++++ hal-add-pm-utils-support.diff ++++++ --- tools/linux/hal-system-power-hibernate-linux +++ tools/linux/hal-system-power-hibernate-linux @@ -10,17 +10,8 @@ exit 1 } -#SuSE and ALTLinux only support powersave -if [ -f /etc/altlinux-release ] || [ -f "/etc/SuSE-release" ] ; then - if [ -x /usr/bin/powersave ] ; then - $POWERSAVED_SUSPEND2DISK - RET=$? - else - unsupported - fi - #Mandriva support suspend-scripts -elif [ -f /etc/mandriva-release ] ; then +if [ -f /etc/mandriva-release ] ; then if [ -x /usr/sbin/pmsuspend ] ; then /usr/sbin/pmsuspend disk RET=$? @@ -29,14 +20,24 @@ fi #RedHat/Fedora only support pm-utils -elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] ; then +elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] || [ -x /usr/sbin/pm-hibernate ] ; then if [ -x /usr/sbin/pm-hibernate ] ; then - /usr/sbin/pm-hibernate + /usr/sbin/pm-hibernate RET=$? else unsupported fi +#SuSE and ALTLinux only support powersave +elif [ -f /etc/altlinux-release ] || [ -f "/etc/SuSE-release" ] ; then + if [ -x /usr/bin/powersave ] ; then + $POWERSAVED_SUSPEND2DISK + RET=$? + else + unsupported + fi + + #Other distros just need to have *any* tools installed else if [ -x "/usr/bin/powersave" ] ; then --- tools/linux/hal-system-power-suspend-linux +++ tools/linux/hal-system-power-suspend-linux @@ -28,18 +28,8 @@ exit 0 fi -#SuSE and ALTLinux only support powersave -if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then - if [ -x /usr/bin/powersave ] ; then - $POWERSAVED_SUSPEND2RAM - RET=$? - else - # TODO: add support - unsupported - fi - #Mandriva supports suspend-scripts -elif [ -f "/etc/mandriva-release" ] ; then +if [ -f "/etc/mandriva-release" ] ; then # TODO: fix pmsuspend to take a --wakeup-alarm argument if [ $seconds_to_sleep != "0" ] ; then alarm_not_supported @@ -54,8 +44,8 @@ fi #RedHat/Fedora only support pm-utils -elif [ -f "/etc/redhat-release" ] || [ -f "/etc/fedora-release" ] ; then - # TODO: fix pm-suspend to take a --wakeup-alarm argument +elif [ -f "/etc/redhat-release" ] || [ -f "/etc/fedora-release" ] || [ -x /usr/sbin/pm-suspend ] ; then + # TODO: fix pm-suspend to take a --wakeup-alarm argument if [ $seconds_to_sleep != "0" ] ; then alarm_not_supported fi @@ -69,6 +59,17 @@ unsupported fi +#SuSE and ALTLinux only support powersave +elif [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then + if [ -x /usr/bin/powersave ] ; then + $POWERSAVED_SUSPEND2RAM + RET=$? + else + # TODO: add support + unsupported + fi + + #FreeBSD uses zzz to suspend for both ACPI and APM elif [ "x`uname -s`" = "xFreeBSD" ] ; then if [ -x /usr/sbin/zzz ] ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de