Hello community, here is the log from the commit of package pm-utils checked in at Sun Mar 18 07:02:13 CET 2007. -------- --- pm-utils/pm-utils.changes 2007-03-16 10:52:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2007-03-16 14:50:45.934489000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 16 14:35:21 CET 2007 - seife@suse.de + +- fix module unloading, pm-utils-0.99.2-fix-modunload.diff + +------------------------------------------------------------------- New: ---- pm-utils-0.99.2-fix-modunload.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.P11142/_old 2007-03-18 07:02:03.000000000 +0100 +++ /var/tmp/diff_new_pack.P11142/_new 2007-03-18 07:02:03.000000000 +0100 @@ -13,7 +13,7 @@ Name: pm-utils URL: http://webcvs.freedesktop.org/pm-utils/ Version: 0.99.2.20070315 -Release: 1 +Release: 2 %define pm_utils_suse_version 20070314 Summary: Tools to suspend and hibernate computers. License: GNU General Public License (GPL) @@ -21,6 +21,7 @@ Source: %{name}-%{version}.tar.gz Patch0: pm-utils-0.99.2.20070315-suse.diff Patch1: pm-utils-0.99.2-uswsusp-support.diff +Patch2: pm-utils-0.99.2-fix-modunload.diff Patch3: pm-utils-0.99.2-comment-configfile.diff Source1: pm-utils-suse-%{pm_utils_suse_version}.tar.gz Source2: README.upstream-hooks @@ -45,6 +46,7 @@ %prep %setup -b 1 %patch1 -p0 +%patch2 -p0 %patch3 -p0 %patch0 -p0 @@ -78,6 +80,8 @@ %changelog * Fri Mar 16 2007 - seife@suse.de +- fix module unloading, pm-utils-0.99.2-fix-modunload.diff +* Fri Mar 16 2007 - seife@suse.de - update to current CVS - pm-utils-0.99.2-fix-stopservice.diff integrated upstream - fix the handling of config files in /etc/pm/config.d/ (they were ++++++ pm-utils-0.99.2-fix-modunload.diff ++++++ Index: pm/functions =================================================================== RCS file: /cvs/pm-utils/pm-utils/pm/functions,v retrieving revision 1.41 diff -u -p -r1.41 functions --- pm/functions 15 Mar 2007 00:42:56 -0000 1.41 +++ pm/functions 16 Mar 2007 13:01:42 -0000 @@ -191,13 +191,14 @@ modunload() { local MOD D C USED MODS I local UNL=$1 RET=1 - UNL=$(echo $UNL | sed -e 's/[_-]/\[_-\]/g') + # the kernel only knows underscores in module names, no dashes + UNL=${UNL//-/_} # RET is the return code. # If at least one module was unloaded, return 0. # if the module was not loaded, also return 0 since this is no error. # if no module was unloaded successfully, return 1 while read MOD D C USED D; do - [[ "$MOD" =~ "$UNL" ]] || continue + [ "$MOD" = "$UNL" ] || continue if [ "$USED" == "-" ]; then _rmmod $MOD $C RET=$? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org