summaryrefslogtreecommitdiff
path: root/source/a/sysvinit-scripts
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-07-27 21:12:53 +0000
committerEric Hameleers <alien@slackware.com>2021-07-28 08:59:52 +0200
commitcdda6f1a7d44ba157dc7948a77b56dc506f1de7b (patch)
treebf7ec77f404dd2a1f8c96c5367c457bc4b9a54e7 /source/a/sysvinit-scripts
parent867a690d0326880380b0fd78373fcade9dc94bc1 (diff)
downloadcurrent-cdda6f1a7d44ba157dc7948a77b56dc506f1de7b.tar.gz
Tue Jul 27 21:12:53 UTC 202120210727211253
a/sysvinit-scripts-15.0-noarch-4.txz: Rebuilt. rc.S: Change /var/run to be a symlink to /run rather than bind mounted. This works around an issue with solid-5.84.0. While there is a patch available for solid, it's probably best to handle the legacy /var/run location in the same way that most other distributions do. Unfortunately, this change needs to be made at boot time before /var/run would be mounted, so a reboot will be required. Make sure that the new /etc/rc.d/rc.S.new is moved to /etc/rc.d/rc.S before rebooting. Thanks to ZhaoLin1457. ap/sudo-1.9.7p2-x86_64-1.txz: Upgraded. d/cmake-3.21.1-x86_64-1.txz: Upgraded. kde/bluedevil-5.22.4-x86_64-1.txz: Upgraded. kde/breeze-5.22.4-x86_64-1.txz: Upgraded. kde/breeze-grub-5.22.4-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.22.4-x86_64-1.txz: Upgraded. kde/drkonqi-5.22.4-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.22.4-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.22.4-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.22.4-x86_64-1.txz: Upgraded. kde/kdecoration-5.22.4-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.22.4-x86_64-1.txz: Upgraded. kde/kgamma5-5.22.4-x86_64-1.txz: Upgraded. kde/khotkeys-5.22.4-x86_64-1.txz: Upgraded. kde/kinfocenter-5.22.4-x86_64-1.txz: Upgraded. kde/kmenuedit-5.22.4-x86_64-1.txz: Upgraded. kde/kscreen-5.22.4-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.22.4-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.22.4-x86_64-1.txz: Upgraded. kde/ksystemstats-5.22.4-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.22.4-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.22.4-x86_64-1.txz: Upgraded. kde/kwayland-server-5.22.4-x86_64-1.txz: Upgraded. kde/kwin-5.22.4-x86_64-1.txz: Upgraded. kde/kwrited-5.22.4-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.22.4-x86_64-1.txz: Upgraded. kde/libkscreen-5.22.4-x86_64-1.txz: Upgraded. kde/libksysguard-5.22.4-x86_64-1.txz: Upgraded. kde/milou-5.22.4-x86_64-1.txz: Upgraded. kde/oxygen-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-disks-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-integration-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-nm-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-pa-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-vault-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.22.4-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.22.4-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.22.4-x86_64-1.txz: Upgraded. kde/powerdevil-5.22.4-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.22.4-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.22.4-x86_64-1.txz: Upgraded. kde/systemsettings-5.22.4-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.22.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/sysvinit-scripts')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.S8
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
2 files changed, 5 insertions, 5 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index 4dce8b6a..ecf2e550 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -23,8 +23,6 @@ if [ -d /run ]; then
if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then
/sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755,size=32M,nodev,nosuid,noexec
fi
- # Make sure that mounts below /run are visible in both /run and /var/run:
- /sbin/mount --make-shared /run
fi
# Load the loop device kernel module:
@@ -367,8 +365,10 @@ 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
-# Bind mount /run to /var/run:
-mount -o bind /run /var/run
+# Make sure that /var/run is a symbolic link pointing to /run:
+if [ -d /run -a ! -L /var/run ]; then
+ (cd /var ; rm -rf run ; ln -sf /run run)
+fi
# 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
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 818e6243..ae1f2346 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:-15.0}
ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# 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