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/scripts/rc.S | |
| parent | 675ce365d7efe35f956695690cd263288b5cc9f1 (diff) | |
| download | current-6e50489feda778db0ff21b6f06adb801e8a5d003.tar.gz current-6e50489feda778db0ff21b6f06adb801e8a5d003.tar.xz | |
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/scripts/rc.S')
| -rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.S | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 03bd9ecec..4dce8b6af 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 |