summaryrefslogtreecommitdiffstats
path: root/source/a/sysvinit-scripts
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-12-20 03:10:57 +0000
committer Eric Hameleers <alien@slackware.com>2020-12-20 08:59:51 +0100
commit98f1ac1fd7a1b5643d4040c9d18276576a7d759a (patch)
treeed148154f5e837b482889bf99527bbc97aa707c0 /source/a/sysvinit-scripts
parentc9a25f18230e4de74520105a1310ca50c9f30239 (diff)
downloadcurrent-98f1ac1fd7a1b5643d4040c9d18276576a7d759a.tar.gz
current-98f1ac1fd7a1b5643d4040c9d18276576a7d759a.tar.xz
Sun Dec 20 03:10:57 UTC 202020201220031057
Linus didn't think this was a scary kernel and in spite of skipping a few branches here before getting to this one, I don't either. Not scary enough to make me think I need to start it out in /testing, anyway. I have a good feeling about this kernel. Enjoy! :-) a/bash-5.1.004-x86_64-1.txz: Upgraded. a/elogind-246.9-x86_64-1.txz: Upgraded. Don't make 10-enable-session-power.rules a .new file. Thanks to Robby Workman. a/kernel-firmware-20201218_646f159-noarch-1.txz: Upgraded. a/kernel-generic-5.10.1-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.1-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.1-x86_64-1.txz: Upgraded. a/ndctl-71-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-37.txz: Rebuilt. rc.S: don't start cgmanager/cgproxy. rc.6: don't stop cgmanager/cgproxy. d/kernel-headers-5.10.1-x86-1.txz: Upgraded. k/kernel-source-5.10.1-noarch-1.txz: Upgraded. l/libtiff-4.2.0-x86_64-1.txz: Upgraded. l/zstd-1.4.8-x86_64-1.txz: Upgraded. n/ca-certificates-20201219-noarch-1.txz: Upgraded. This update provides the latest CA certificates to check for the authenticity of SSL connections. xap/libnma-1.8.30-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
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