summaryrefslogtreecommitdiffstats
path: root/source/a/sysvinit-scripts
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-02-13 20:17:58 +0000
committer Eric Hameleers <alien@slackware.com>2020-02-14 08:59:48 +0100
commitbea4af160dc640549e07144b9a0dddf09b569861 (patch)
treefd503608cc157d2e102b48dddff9ba0e26387522 /source/a/sysvinit-scripts
parenta2163e3ab2d184702eeb1c4f7c0c9bed6d178206 (diff)
downloadcurrent-bea4af160dc640549e07144b9a0dddf09b569861.tar.gz
current-bea4af160dc640549e07144b9a0dddf09b569861.tar.xz
Thu Feb 13 20:17:58 UTC 202020200213201758
a/sysvinit-scripts-2.1-noarch-29.txz: Rebuilt. rc.S: make /var/run a bind mount to /run. Thanks to Robby Workman. rc.S: make a few adjustments to temporary file cleanup. rc.M: drop additional checks on starting rc.syslog. a/util-linux-2.35.1-x86_64-2.txz: Rebuilt. d/bison-3.5.2-x86_64-1.txz: Upgraded. l/pcre-8.44-x86_64-1.txz: Upgraded. l/sdl-1.2.15-x86_64-9.txz: Rebuilt. Replaced missing SDL_ttf docs. Thanks to Stuart Winter. n/krb5-1.18-x86_64-1.txz: Upgraded. x/mesa-19.3.4-x86_64-1.txz: Upgraded. testing/packages/PAM/util-linux-2.35.1-x86_64-2_pam.txz: Rebuilt. Added /etc/default/su containing 'ALWAYS_SET_PATH yes' to ensure that ENV_SUPATH from /etc/login.defs is used for the $PATH with plain 'su'.
Diffstat (limited to 'source/a/sysvinit-scripts')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.M2
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.S13
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
3 files changed, 10 insertions, 7 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index cfffb8ec4..c0424ebe9 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -75,7 +75,7 @@ if [ -x /etc/rc.d/rc.pcmcia ]; then
fi
# Start the system logger.
-if [ -x /etc/rc.d/rc.syslog -a -x /usr/sbin/syslogd -a -d /var/log ]; then
+if [ -x /etc/rc.d/rc.syslog ]; then
/etc/rc.d/rc.syslog start
fi
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index 4162938f3..eb1765e10 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -367,6 +367,11 @@ else
/sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done
fi
+# This should be empty as it's just a mountpoint now:
+rm -rf /var/run/*
+# Bind mount /run to /var/run:
+mount -o bind /run /var/run
+
# Enable swapping again. This is needed in case a swapfile is used,
# as it can't be enabled until the filesystem it resides on has been
# mounted read-write.
@@ -384,16 +389,14 @@ if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; t
fi
# Clean up some temporary files:
-rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \
- /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \
- /var/state/saslauthd/saslauthd.pid \
- /tmp/.Xauth* 1> /dev/null 2> /dev/null
+rm -f /etc/nologin /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \
+ /var/state/saslauthd/saslauthd.pid /tmp/.Xauth* 1> /dev/null 2> /dev/null
+rm -rf /tmp/{kde-[a-zA-Z]*,ksocket-[a-zA-Z]*,hsperfdata_[a-zA-Z]*,plugtmp*}
if [ -d /var/lib/pkgtools/setup/tmp ]; then
( cd /var/lib/pkgtools/setup/tmp && rm -rf * )
elif [ -d /var/log/setup/tmp ]; then
( cd /var/log/setup/tmp && rm -rf * )
fi
-( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* )
# Clear /var/lock/subsys:
if [ -d /var/lock/subsys ]; then
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 67beccea7..d3537dab4 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:-28}
+BUILD=${BUILD:-29}
# 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