From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Apr 2011 13:37:00 +0000
Subject: Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!
---
 source/a/libcgroup/libcgroup.init.diff | 133 +++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 source/a/libcgroup/libcgroup.init.diff

(limited to 'source/a/libcgroup/libcgroup.init.diff')

diff --git a/source/a/libcgroup/libcgroup.init.diff b/source/a/libcgroup/libcgroup.init.diff
new file mode 100644
index 000000000..754912959
--- /dev/null
+++ b/source/a/libcgroup/libcgroup.init.diff
@@ -0,0 +1,133 @@
+--- ./scripts/init.d/cgred.in.orig	2011-03-03 02:29:41.000000000 -0600
++++ ./scripts/init.d/cgred.in	2011-03-03 14:23:03.000000000 -0600
+@@ -39,9 +39,8 @@
+ # Sanity checks
+ [ -x $CGRED_BIN ] || exit 1
+ 
+-# Source function library & LSB routines
++# Source function library
+ . /etc/rc.d/init.d/functions
+-. /lib/lsb/init-functions
+ 
+ # Read in configuration options.
+ if [ -f "/etc/sysconfig/cgred.conf" ] ; then
+@@ -70,16 +69,16 @@
+ {
+ 	echo -n $"Starting CGroup Rules Engine Daemon: "
+ 	if [ -f "$lockfile" ]; then
+-		log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
++		echo "$servicename is already running with PID `cat ${pidfile}`"
+ 		return 0
+ 	fi
+ 	if [ ! -s $CGRED_CONF ]; then
+-		log_failure_msg "not configured"
++		echo "not configured"
+ 		return 6
+ 	fi
+ 	if ! grep "^cgroup" /proc/mounts &>/dev/null; then
+ 		echo
+-		log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
++		echo $"Cannot find cgroups, is cgconfig service running?"
+ 		return 1
+ 	fi
+ 	daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
+@@ -100,7 +99,7 @@
+ {
+ 	echo -n $"Stopping CGroup Rules Engine Daemon..."
+ 	if [ ! -f $pidfile ]; then
+-		log_success_msg
++		#log_success_msg
+ 		return 0
+ 	fi
+ 	killproc -p $pidfile -TERM "$processname"
+@@ -146,13 +145,13 @@
+ 			echo $"Reloading rules configuration..."
+ 			kill -s 12 `cat ${pidfile}`
+ 			RETVAL=$?
+-			if [ $RETVAL -eq 0 ] ; then
+-				log_success_msg
+-			else
+-				log_failure_msg
+-			fi
++			#if [ $RETVAL -eq 0 ] ; then
++			#	log_success_msg
++			#else
++			#	log_failure_msg
++			#fi
+ 		else
+-			log_failure_msg "$servicename is not running."
++			echo "$servicename is not running."
+ 		fi
+ 		;;
+ 	*)
+--- ./scripts/init.d/cgconfig.in.orig	2011-03-03 02:29:41.000000000 -0600
++++ ./scripts/init.d/cgconfig.in	2011-03-03 14:21:27.000000000 -0600
+@@ -36,11 +36,6 @@
+ servicename=cgconfig
+ lockfile=/var/lock/subsys/$servicename
+ 
+-#
+-# Source LSB routines
+-#
+-. /lib/lsb/init-functions
+-
+ # read the config
+ CREATE_DEFAULT=yes
+ if [ -e /etc/sysconfig/cgconfig ]; then
+@@ -54,8 +49,8 @@
+ 	    grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf | \
+ 		    read user ctrl defaultcgroup
+             if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
+-                log_warning_msg "/etc/cgrules.conf incorrect"
+-                log_warning_msg "Overriding it"
++                echo "/etc/cgrules.conf incorrect"
++                echo "Overriding it"
+                 defaultcgroup=
+             fi
+         fi
+@@ -98,20 +93,20 @@
+ start() {
+         echo -n "Starting cgconfig service: "
+ 	if [ -f "$lockfile" ]; then
+-            log_warning_msg "lock file already exists"
++            echo "lock file already exists"
+             return 0
+         fi
+ 
+         if [ $? -eq 0 ]; then
+                 if [ ! -s $CONFIG_FILE ]; then
+-                    log_failure_msg $CONFIG_FILE "is not configured"
++                    echo $CONFIG_FILE "is not configured"
+                     return 6
+                 fi
+ 
+                 $CGCONFIGPARSER_BIN -l $CONFIG_FILE
+                 retval=$?
+                 if [ $retval -ne 0 ]; then
+-                    log_failure_msg "Failed to parse " $CONFIG_FILE
++                    echo "Failed to parse " $CONFIG_FILE
+                     return 1
+                 fi
+         fi
+@@ -123,10 +118,10 @@
+         touch "$lockfile"
+         retval=$?
+         if [ $retval -ne 0 ]; then
+-            log_failure_msg "Failed to touch $lockfile"
++            echo "Failed to touch $lockfile"
+             return 1
+         fi
+-        log_success_msg
++        #log_success_msg
+         return 0
+ }
+ 
+@@ -134,7 +129,7 @@
+     echo -n "Stopping cgconfig service: "
+     cgclear
+     rm -f "$lockfile"
+-    log_success_msg
++    #log_success_msg
+     return 0
+ }
+ 
-- 
cgit v1.2.3