diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-04-23 19:13:09 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-04-24 08:59:55 +0200 |
commit | 6e50489feda778db0ff21b6f06adb801e8a5d003 (patch) | |
tree | e5747d4987977f0c4cea786e4f09c35d58c847a2 /source/a/sysvinit-scripts | |
parent | 675ce365d7efe35f956695690cd263288b5cc9f1 (diff) | |
download | current-6e50489feda778db0ff21b6f06adb801e8a5d003.tar.gz |
Fri Apr 23 19:13:09 UTC 202120210423191309
a/pkgtools-15.0-noarch-39.txz: Rebuilt.
upgradepkg: revert change where $ROOT/sbin/installpkg is called instead of
/sbin/installpkg. Conceptually, this seemed like a nice change (but would
have also required removepkg to be called the same way), but it seems to
break an established expectation that the pkgtools can be used without them
actually being installed in $ROOT. Thanks to alienBOB.
a/sysvinit-scripts-15.0-noarch-2.txz: Rebuilt.
Use #!/bin/bash for these scripts so that bashisms don't cause script issues
if /bin/sh is some other shell. Thanks to mumahendras3.
rc.S: Use GazL's proposals for detecting/mounting /proc and /sys.
d/parallel-20210422-noarch-1.txz: Upgraded.
l/glib-networking-2.68.1-x86_64-1.txz: Upgraded.
l/gtk+3-3.24.29-x86_64-1.txz: Upgraded.
x/igt-gpu-tools-1.26-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
Rebuild with pkgtools-15.0-noarch-39.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Rebuild with pkgtools-15.0-noarch-39.
Diffstat (limited to 'source/a/sysvinit-scripts')
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.4 | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.6 | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.K | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.M | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.S | 14 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.cpufreq | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.local | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.loop | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.modules | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.modules.local | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.sysvinit | 2 | ||||
-rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 |
12 files changed, 16 insertions, 20 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.4 b/source/a/sysvinit-scripts/scripts/rc.4 index 76278410..ee32e48f 100644 --- a/source/a/sysvinit-scripts/scripts/rc.4 +++ b/source/a/sysvinit-scripts/scripts/rc.4 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # # rc.4 This file is executed by init(8) when the system is being # initialized for run level 4 (XDM) diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index b95c35c4..92338d4d 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # # rc.6 This file is executed by init when it goes into runlevel # 0 (halt) or runlevel 6 (reboot). It kills all processes, diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K index a8d0808c..4330eafc 100644 --- a/source/a/sysvinit-scripts/scripts/rc.K +++ b/source/a/sysvinit-scripts/scripts/rc.K @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # # rc.K This file is executed by init when it goes into runlevel # 1, which is the administrative state. It kills all diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index f2c7952c..8a1a9b04 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # rc.M This file is executed by init(8) when the system is being # initialized for one of the "multi user" run levels (i.e. diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 03bd9ece..4dce8b6a 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # /etc/rc.d/rc.S: System initialization script. # @@ -8,17 +8,13 @@ PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin # Mount /proc if it is not already mounted: -if [ ! -r /proc/self/mounts ]; then +if [ ! -d /proc/sys ]; then /sbin/mount -v proc /proc -n -t proc 2> /dev/null fi -# Mount sysfs next, if the kernel supports it: -if [ -d /sys ]; then - if grep -wq sysfs /proc/filesystems ; then - if ! grep -wq sysfs /proc/mounts ; then - /sbin/mount -v sysfs /sys -n -t sysfs - fi - fi +# Mount /sys if it is not already mounted: +if [ ! -d /sys/kernel ]; then + /sbin/mount -v sysfs /sys -n -t sysfs 2> /dev/null fi # If /run exists, mount a tmpfs on it (unless the diff --git a/source/a/sysvinit-scripts/scripts/rc.cpufreq b/source/a/sysvinit-scripts/scripts/rc.cpufreq index 4caaa5a4..10d713f0 100644 --- a/source/a/sysvinit-scripts/scripts/rc.cpufreq +++ b/source/a/sysvinit-scripts/scripts/rc.cpufreq @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # rc.cpufreq: Settings for CPU frequency and voltage scaling in the kernel. # For more information, see the kernel documentation in diff --git a/source/a/sysvinit-scripts/scripts/rc.local b/source/a/sysvinit-scripts/scripts/rc.local index 65b358bb..18f481d3 100644 --- a/source/a/sysvinit-scripts/scripts/rc.local +++ b/source/a/sysvinit-scripts/scripts/rc.local @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # /etc/rc.d/rc.local: Local system initialization script. # diff --git a/source/a/sysvinit-scripts/scripts/rc.loop b/source/a/sysvinit-scripts/scripts/rc.loop index 942fc544..6d15a60f 100644 --- a/source/a/sysvinit-scripts/scripts/rc.loop +++ b/source/a/sysvinit-scripts/scripts/rc.loop @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Load the loop device kernel module. # diff --git a/source/a/sysvinit-scripts/scripts/rc.modules b/source/a/sysvinit-scripts/scripts/rc.modules index 650c0ef8..cc5c7d25 100644 --- a/source/a/sysvinit-scripts/scripts/rc.modules +++ b/source/a/sysvinit-scripts/scripts/rc.modules @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # /etc/rc.d/rc.modules diff --git a/source/a/sysvinit-scripts/scripts/rc.modules.local b/source/a/sysvinit-scripts/scripts/rc.modules.local index 6bd1f339..ef1bfc52 100644 --- a/source/a/sysvinit-scripts/scripts/rc.modules.local +++ b/source/a/sysvinit-scripts/scripts/rc.modules.local @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # /etc/rc.d/rc.modules.local diff --git a/source/a/sysvinit-scripts/scripts/rc.sysvinit b/source/a/sysvinit-scripts/scripts/rc.sysvinit index 057c3f1e..4cbd873e 100644 --- a/source/a/sysvinit-scripts/scripts/rc.sysvinit +++ b/source/a/sysvinit-scripts/scripts/rc.sysvinit @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # rc.sysvinit This file provides basic compatibility with SystemV style # startup scripts. The SystemV style init system places diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 7c126419..d09bc302 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:-1} +BUILD=${BUILD:-2} # 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 |