Hello community, here is the log from the commit of package pm-utils checked in at Thu Dec 7 21:22:51 CET 2006. -------- --- pm-utils/pm-utils.changes 2006-11-22 17:21:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2006-12-05 18:21:18.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Dec 5 18:06:13 CET 2006 - seife@suse.de + +- fix 30s2disk-check hook, so that suspend with the kernel method + works again (fixes bug 226115) + +------------------------------------------------------------------- +Thu Nov 30 21:07:40 CET 2006 - seife@suse.de + +- fix on_ac_power on desktops with battery powered mice + (bug 221999) +- make running the hooks slightly more verbose + +------------------------------------------------------------------- New: ---- pm-utils-fix-on_ac_power-bug221999.diff pm-utils-make-hooks-verbose.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.6NsTnv/_old 2006-12-07 21:22:38.000000000 +0100 +++ /var/tmp/diff_new_pack.6NsTnv/_new 2006-12-07 21:22:38.000000000 +0100 @@ -13,7 +13,7 @@ Name: pm-utils URL: http://webcvs.freedesktop.org/pm-utils/ Version: 0.20.0.20061114 -Release: 3 +Release: 5 Summary: Tools to suspend and hibernate computers. License: GNU General Public License (GPL) Group: System/Base @@ -22,6 +22,8 @@ Patch1: pm-utils-fix-source-configs.diff Patch2: pm-utils-uswsusp-support.diff Patch3: pm-utils-comment-configfile.diff +Patch5: pm-utils-make-hooks-verbose.diff +Patch4: pm-utils-fix-on_ac_power-bug221999.diff Source1: pm-utils-suse.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr @@ -46,6 +48,8 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 +%patch5 -p0 %patch0 -p0 %build @@ -74,6 +78,13 @@ %doc README COPYING ChangeLog AUTHORS %changelog -n pm-utils +* Tue Dec 05 2006 - seife@suse.de +- fix 30s2disk-check hook, so that suspend with the kernel method + works again (fixes bug 226115) +* Thu Nov 30 2006 - seife@suse.de +- fix on_ac_power on desktops with battery powered mice + (bug 221999) +- make running the hooks slightly more verbose * Wed Nov 22 2006 - seife@suse.de - fix dualcore cpufreq problem after suspend (bug 223164) - mark the configfile as "noreplace" ++++++ pm-utils-fix-on_ac_power-bug221999.diff ++++++ --- src/on_ac_power +++ src/on_ac_power @@ -29,13 +29,17 @@ # # Check for AC/DC/etc adapters -for device in $(hal-find-by-capability --capability ac_adapter) ; do +ac_adapters=$(hal-find-by-capability --capability ac_adapter) + +# If there are no ac_adapters, it is most likely a desktop. +# assume online +[ -z "$ac_adapters" ] && exit 0 + +# Check if all $ac_adapters are not present +for device in $ac_adapters ; do present=$(hal-get-property --udi $device --key ac_adapter.present) [ "$present" == "true" ] && exit 0 done -# If there are no ac_adapters, check for batteries. -hal-find-by-capability --capability battery >/dev/null 2>&1 && exit 1 - -# If there are no batteries assume AC. -exit 0 +# If none of them were present, ret will be 1, signalling "not on AC power" +exit 1 ++++++ pm-utils-make-hooks-verbose.diff ++++++ Index: pm/functions =================================================================== RCS file: /cvs/pm-utils/pm-utils/pm/functions,v retrieving revision 1.30 diff -u -p -r1.30 functions --- pm/functions 14 Nov 2006 16:01:30 -0000 1.30 +++ pm/functions 28 Nov 2006 20:23:57 -0000 @@ -99,6 +99,8 @@ run_hooks() fi done fi + + echo "$(date): finished $1 hooks." } get_power_status() @@ -214,7 +216,7 @@ stopservice() service "$1" status 2>/dev/null | grep -c -q running if [ "$?" == "0" -a -x "/etc/init.d/$1" ]; then echo "export ${1}_SERVICE_ACTIVATE=yes" >> /var/run/pm-suspend - "/etc/init.d/$1" stop >/dev/null 2>&1 + "/etc/init.d/$1" stop 2>&1 fi } @@ -222,7 +224,7 @@ restartservice() { if [ "x$(eval echo $${1}_SERVICE_ACTIVATE)" == "xyes" \ -a -x "/etc/init.d/$1" ]; then - "/etc/init.d/$1" start >/dev/null 2>&1 + "/etc/init.d/$1" start 2>&1 fi } ++++++ pm-utils-suse.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/30s2disk-check new/pm-utils-suse/hooks/30s2disk-check --- old/pm-utils-suse/hooks/30s2disk-check 2006-11-08 13:45:07.000000000 +0100 +++ new/pm-utils-suse/hooks/30s2disk-check 2006-12-05 17:52:45.000000000 +0100 @@ -53,7 +53,7 @@ return 1 fi X=$(stat -Lc '$((0x%t)):$((0x%T))' $RESUME) - RDEV=$(echo $X) + RDEV=$(eval echo $X) if [ "$DEV" != "$RDEV" ]; then echo "ERROR: /sys/power/resume ($DEV) disagrees with resume= parameter ($RDEV)" echo " can not suspend." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org