summaryrefslogtreecommitdiffstats
path: root/source/a/sysvinit-scripts
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/sysvinit-scripts')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.65
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.S5
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
3 files changed, 1 insertions, 11 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index e3e71bef0..b95c35c44 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -231,11 +231,6 @@ if [ ! "$(cat /proc/swaps | wc -l)" = "1" ]; then
/bin/sync
fi
-# Stop cgmanager and cgproxy:
-if [ -x /etc/rc.d/rc.cgmanager ]; then
- /etc/rc.d/rc.cgmanager stop
-fi
-
# Umount all tmpfs mounts except /dev/shm and under /run:
cat /proc/mounts | grep " tmpfs " | grep -v -e " /run " -e " /run/" -e " /dev/shm " | while read mount ; do
umount --recursive -v $(echo $mount | cut -f 2 -d ' ') 2> /dev/null
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index e0188a108..aa40bac1b 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -379,11 +379,6 @@ mount -o bind /run /var/run
# mounted read-write.
/sbin/swapon -a 2> /dev/null
-# Start cgmanager (or cgproxy in a container):
-if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then
- /etc/rc.d/rc.cgmanager start
-fi
-
# Start libcgroup services:
if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; then
/etc/rc.d/rc.cgconfig start ; echo " /usr/sbin/cgconfigparser -l /etc/cgconfig.conf"
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 78e1381c4..a0dc04e3c 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit-scripts
VERSION=${VERSION:-2.1}
ARCH=noarch
-BUILD=${BUILD:-36}
+BUILD=${BUILD:-37}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information