summaryrefslogtreecommitdiff
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.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