From bea4af160dc640549e07144b9a0dddf09b569861 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 13 Feb 2020 20:17:58 +0000 Subject: Thu Feb 13 20:17:58 UTC 2020 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'. --- source/a/sysvinit-scripts/scripts/rc.S | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source/a/sysvinit-scripts/scripts/rc.S') 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 -- cgit v1.2.3-65-gdbad