commit pm-utils

27 Oct 2006

Hello community,

here is the log from the commit of package pm-utils
checked in at Fri Oct 27 19:11:54 CEST 2006.

--------

--- pm-utils/pm-utils.changes	2006-10-24 17:49:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes	2006-10-27 19:05:15.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 27 19:03:53 CEST 2006 - hmacht@suse.de
+
+- readd lost S2DISK_BIN and S2DISK_CONF variables
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.XF1Ajs/_old	2006-10-27 19:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.XF1Ajs/_new	2006-10-27 19:06:47.000000000 +0200
@@ -13,7 +13,7 @@
 Name:           pm-utils
 URL:            http://webcvs.freedesktop.org/pm-utils/
 Version:        0.20.0.20061024
-Release:        1
+Release:        2
 Summary:        Tools to suspend and hibernate computers.
 License:        GNU General Public License (GPL) - all versions
 Group:          System/Base
@@ -68,6 +68,8 @@
 %doc README COPYING ChangeLog AUTHORS
 
 %changelog -n pm-utils
+* Fri Oct 27 2006 - hmacht@suse.de
+- readd lost S2DISK_BIN and S2DISK_CONF variables
 * Tue Oct 24 2006 - hmacht@suse.de
 - update to current CVS, some fixes incorporated upstream.
 - add logging functionality

++++++ pm-utils-0.20.0.20061024-suse.diff ++++++
--- /var/tmp/diff_new_pack.XF1Ajs/_old	2006-10-27 19:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.XF1Ajs/_new	2006-10-27 19:06:47.000000000 +0200
@@ -1,21 +1,26 @@
 --- pm/functions
 +++ pm/functions
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,10 @@
  # default values go here
  HIBERNATE_RESUME_POST_VIDEO=no
  SUSPEND_MODULES=""
 -RESUME_MODULES=""
 +INHIBIT=/var/run/pm-utils.inhibit
++S2DISK_BIN=/usr/sbin/s2disk
++S2DISK_CONF=/var/lib/s2disk.conf
++
  LOGFILE=/var/log/pm-suspend.log
  
  [ -f /etc/pm/config ] && . /etc/pm/config
-@@ -19,21 +19,20 @@
+@@ -19,21 +22,22 @@
  # export them all here
  add_global HIBERNATE_RESUME_POST_VIDEO
  add_global SUSPEND_MODULES
 -add_global RESUME_MODULES
 +add_global INHIBIT
  add_global LOGFILE
++add_global S2DISK_BIN
++add_global S2DISK_CONF
  
  source_configs()
  {
@@ -41,7 +46,7 @@
  	done
  }
  
-@@ -57,7 +56,7 @@
+@@ -57,7 +61,7 @@
  
  remove_suspend_lock()
  {
@@ -50,7 +55,7 @@
  	chvt 1
  	chvt $VT
  	openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
-@@ -68,7 +67,7 @@
+@@ -68,7 +72,7 @@
  	[ -z "$1" ] && return 0
  
  	[ -f /var/run/pm-suspend ] && . /var/run/pm-suspend
@@ -59,7 +64,7 @@
  
  	echo "$(date): running $1 hooks."
  
-@@ -80,14 +79,14 @@
+@@ -80,14 +84,14 @@
  			let filen--
  			file="${filea[$filen]}"
  			if [ -x $file ]; then
@@ -76,7 +81,7 @@
  				$file $1
  			fi
  		done
-@@ -113,24 +112,59 @@
+@@ -113,24 +117,59 @@
  	return $RETVAL
  }
  


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)