Hello community, here is the log from the commit of package pm-utils checked in at Wed Dec 20 20:29:15 CET 2006. -------- --- pm-utils/pm-utils.changes 2006-12-05 18:21:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2006-12-20 19:23:31.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 20 18:36:59 CET 2006 - seife@suse.de + +- fix resume problems if the "Failsafe" kernel is listed before + the "good" kernel in /boot/grub/menu.lst (bug 223722) +- package the disabled hooks in the documentation directory +- disable the 49blutetooth hook + +------------------------------------------------------------------- New: ---- README.upstream-hooks ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.RpCZpX/_old 2006-12-20 20:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.RpCZpX/_new 2006-12-20 20:27:58.000000000 +0100 @@ -13,7 +13,7 @@ Name: pm-utils URL: http://webcvs.freedesktop.org/pm-utils/ Version: 0.20.0.20061114 -Release: 5 +Release: 8 Summary: Tools to suspend and hibernate computers. License: GNU General Public License (GPL) Group: System/Base @@ -25,6 +25,7 @@ Patch5: pm-utils-make-hooks-verbose.diff Patch4: pm-utils-fix-on_ac_power-bug221999.diff Source1: pm-utils-suse.tar.gz +Source2: README.upstream-hooks BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr Requires: hal @@ -59,9 +60,12 @@ %install make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/etc/pm/hooks/01grub -rm $RPM_BUILD_ROOT/etc/pm/hooks/20video -rm $RPM_BUILD_ROOT/etc/pm/hooks/90clock +mkdir hooks +mv $RPM_BUILD_ROOT/etc/pm/hooks/01grub hooks +mv $RPM_BUILD_ROOT/etc/pm/hooks/20video hooks +mv $RPM_BUILD_ROOT/etc/pm/hooks/49bluetooth hooks +mv $RPM_BUILD_ROOT/etc/pm/hooks/90clock hooks +cp %{S:2} hooks cd ../pm-utils-suse cp -r hooks $RPM_BUILD_ROOT/etc/pm/ @@ -76,8 +80,14 @@ /usr/bin/* %_mandir/man1/* %doc README COPYING ChangeLog AUTHORS +%doc hooks %changelog -n pm-utils +* Wed Dec 20 2006 - seife@suse.de +- fix resume problems if the "Failsafe" kernel is listed before + the "good" kernel in /boot/grub/menu.lst (bug 223722) +- package the disabled hooks in the documentation directory +- disable the 49blutetooth hook * Tue Dec 05 2006 - seife@suse.de - fix 30s2disk-check hook, so that suspend with the kernel method works again (fixes bug 226115) ++++++ pm-utils-suse.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/99Zgrub new/pm-utils-suse/hooks/99Zgrub --- old/pm-utils-suse/hooks/99Zgrub 2006-11-08 13:55:49.000000000 +0100 +++ new/pm-utils-suse/hooks/99Zgrub 2006-12-20 18:36:36.000000000 +0100 @@ -27,10 +27,14 @@ # DEBUG "Found grub menu entry #${J}: '${LINE}'" INFO ;; default*) - DUMMY=($LINE) # "default 0 #maybe a comment" + DUMMY=($LINE) # "default 0 #maybe a comment" echo "DEFAULT_BOOT=${DUMMY[1]}" # ^^[0]^^ 1 ^^[2]^ 3 ^^[4]^^ # DEBUG "Default boot entry is '${DUMMY[1]}'" INFO ;; + kernel*noresume*) + # we probably found the "failsafe" kernel that won't resume... + echo " Skipping grub entry #${J}, because it has the noresume option" >&2 + ;; kernel*) DUMMY=($LINE) # kernel (hd0,1)/boot/vmlinuz-ABC root=/dev/hda2 echo "KERNELS[$I]='${DUMMY[1]##*/}'" # vmlinuz-ABC ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org