[pve-devel] r5488 - in ksm-control-daemon/trunk: . debian debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-07 07:11:18 +0100 (Mon, 07 Feb 2011)
New Revision: 5488

Modified:
   ksm-control-daemon/trunk/Makefile
   ksm-control-daemon/trunk/debian/changelog
   ksm-control-daemon/trunk/debian/patches/init-script.diff
   ksm-control-daemon/trunk/debian/patches/ksmtuned.diff
Log:


Modified: ksm-control-daemon/trunk/Makefile
===================================================================
--- ksm-control-daemon/trunk/Makefile	2011-02-04 08:14:26 UTC (rev 5487)
+++ ksm-control-daemon/trunk/Makefile	2011-02-07 06:11:18 UTC (rev 5488)
@@ -2,7 +2,7 @@
 
 PACKAGE=ksm-control-daemon
 PKGVER=1.0
-PKGREL=4
+PKGREL=5
 
 KSM_DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
 

Modified: ksm-control-daemon/trunk/debian/changelog
===================================================================
--- ksm-control-daemon/trunk/debian/changelog	2011-02-04 08:14:26 UTC (rev 5487)
+++ ksm-control-daemon/trunk/debian/changelog	2011-02-07 06:11:18 UTC (rev 5488)
@@ -1,3 +1,9 @@
+ksm-control-daemon (1.0-5) unstable; urgency=low
+
+  * update to latest available version
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 07 Feb 2011 07:10:26 +0100
+
 ksm-control-daemon (1.0-4) unstable; urgency=low
 
   * set KSM_SLEEP_MSEC=100 to reducd cpu load

Modified: ksm-control-daemon/trunk/debian/patches/init-script.diff
===================================================================
--- ksm-control-daemon/trunk/debian/patches/init-script.diff	2011-02-04 08:14:26 UTC (rev 5487)
+++ ksm-control-daemon/trunk/debian/patches/init-script.diff	2011-02-07 06:11:18 UTC (rev 5488)
@@ -1,7 +1,7 @@
-Index: ksm-control-scripts/ksmtuned.init
+Index: new/ksmtuned.init
 ===================================================================
---- ksm-control-scripts.orig/ksmtuned.init	2009-12-15 13:19:36.000000000 +0100
-+++ ksm-control-scripts/ksmtuned.init	2009-12-29 16:18:04.000000000 +0100
+--- new.orig/ksmtuned.init	2011-02-07 06:43:33.000000000 +0100
++++ new/ksmtuned.init	2011-02-07 06:55:56.000000000 +0100
 @@ -20,6 +20,7 @@
  # Required-Stop:
  # Should-Start:
@@ -81,35 +81,45 @@
  case "$1" in
    start)
  	start
-@@ -67,21 +87,26 @@
+@@ -67,27 +87,28 @@
  	stop
  	;;
    status)
 -        status -p ${pidfile} $prog
+-	RETVAL=$?
 +	pidofproc -p ${pidfile} $ksmtuned >/dev/null
- 	RETVAL=$?
++ 	RETVAL=$?
 +	if [ $RETVAL -eq 0 ]; then
-+		log_success_msg "$DESC is running."
++	    log_success_msg "$DESC is running."
 +	else
-+		log_failure_msg "$DESC is not running."
++	    log_failure_msg "$DESC is not running."
 +	fi
  	;;
-   restart)
+   restart|force-reload)
  	restart
  	;;
--  condrestart)
+-  condrestart|try-restart)
 -	condrestart
-+  force-reload)
-+	restart
- 	;;
+-	;;
 -  retune)
+-        pid=`cat ${pidfile} 2> /dev/null`
+-        RETVAL=$?
+-        if [ -z "$pid" ]; then
+-	    echo $"Cannot retune, service is not running."
+-	else
 +  reload)
-         kill -SIGUSR1 `cat ${pidfile}`
-         RETVAL=$?
++	pid=$( pidofproc -p ${pidfile} $ksmtuned )
++	if [ -n "$pid" ] ; then
+             kill -SIGUSR1 $pid
+             RETVAL=$?
+-	fi
++	else
++	    log_failure_msg "$DESC is not running."
++ 	fi
          ;;
    *)
--	echo $"Usage: $prog {start|stop|restart|condrestart|status|retune|help}"
-+	echo $"Usage: $prog {start|stop|restart|force-restart|status|reload}"
- 	RETVAL=3
+-	echo $"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status|retune|help}"
++	echo $"Usage: $prog {start|stop|restart|force-reload|status|reload|help}"
+ 	RETVAL=2
  esac
  

Modified: ksm-control-daemon/trunk/debian/patches/ksmtuned.diff
===================================================================
--- ksm-control-daemon/trunk/debian/patches/ksmtuned.diff	2011-02-04 08:14:26 UTC (rev 5487)
+++ ksm-control-daemon/trunk/debian/patches/ksmtuned.diff	2011-02-07 06:11:18 UTC (rev 5488)
@@ -1,22 +1,17 @@
-Index: ksm-control-scripts/ksmtuned
+Index: new/ksmtuned
 ===================================================================
---- ksm-control-scripts.orig/ksmtuned	2009-12-15 13:19:36.000000000 +0100
-+++ ksm-control-scripts/ksmtuned	2010-02-01 14:47:59.000000000 +0100
-@@ -63,8 +63,11 @@
+--- new.orig/ksmtuned	2011-02-07 06:43:33.000000000 +0100
++++ new/ksmtuned	2011-02-07 07:07:22.000000000 +0100
+@@ -71,7 +71,7 @@
  committed_memory () {
      # calculate how much memory is committed to running qemu processes
      local progname
--    progname=${1:-qemu}
--    ps -o vsz `pgrep $progname` | awk '{ sum += $1 }; END { print sum }'
+-    progname=${1:-qemu-kvm}
 +    progname=${1:-kvm}
-+    local plist
-+    plist=$(pgrep -d ' ' -x $progname);
-+    [ -z "$plist" ] && echo 0 && return
-+    ps -o vsz $plist | awk '{ sum += $1 }; END { print sum }'
+     ps -C "$progname" -o rsz | awk '{ sum += $1 }; END { print sum }'
  }
  
- free_memory () {
-@@ -116,8 +119,7 @@
+@@ -124,8 +124,7 @@
      trap nothing SIGUSR1
      while true
      do