summaryrefslogtreecommitdiff
path: root/source/a
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-11-12 19:19:46 +0000
committerEric Hameleers <alien@slackware.com>2021-11-13 08:59:55 +0100
commit16ac9d3a43867e3a389c4459e8d2cd01b7cc13ed (patch)
treed4559a81e92fe4a6a5527539304179048bf20269 /source/a
parent5f74398bf9e65ea1aa61c9a843a88f98700ccab7 (diff)
downloadcurrent-16ac9d3a43867e3a389c4459e8d2cd01b7cc13ed.tar.gz
Fri Nov 12 19:19:46 UTC 202120211112191946
a/kernel-generic-5.15.2-x86_64-1.txz: Upgraded. a/kernel-huge-5.15.2-x86_64-1.txz: Upgraded. a/kernel-modules-5.15.2-x86_64-1.txz: Upgraded. a/sysvinit-scripts-15.0-noarch-7.txz: Rebuilt. rc.M: adjust the startup order to make sure a few services are running when needed (such as MariaDB for dovecot and postfix). Thanks to Tshane. ap/ksh93-20211112_d160abc-x86_64-1.txz: Upgraded. Don't assume that /bin/sh mode is desired when ksh is run from su. Thanks to McDutchie. ap/lxc-4.0.11-x86_64-2.txz: Rebuilt. Move the bash-completion symlinks to the system directory. Thanks to kaott. d/kernel-headers-5.15.2-x86-1.txz: Upgraded. k/kernel-source-5.15.2-noarch-1.txz: Upgraded. l/pipewire-0.3.40-x86_64-1.txz: Upgraded. n/s-nail-14.9.23-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.M38
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
2 files changed, 20 insertions, 20 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index c1e04c58..a0d371d1 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -5,7 +5,7 @@
# levels 1 through 6). It usually does mounting of file
# systems et al.
#
-# Version: @(#)/etc/rc.d/rc.M 2.23 Wed Feb 26 19:20:58 PST 2003
+# Version: @(#)/etc/rc.d/rc.M 15.0 Fri Nov 12 18:51:28 UTC 2021
#
# Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
# Heavily modified by Patrick Volkerding <volkerdi@slackware.com>
@@ -334,19 +334,6 @@ if grep -q quota /etc/fstab ; then
fi
fi
-# Start the SASL authentication server. This provides SASL
-# authentication services for sendmail/postfix:
-if [ -x /etc/rc.d/rc.saslauthd ]; then
- /etc/rc.d/rc.saslauthd start
-fi
-
-# Start the mail server. Try the rc.sendmail script first, then try rc.postfix.
-if [ -x /etc/rc.d/rc.sendmail -a -x usr/sbin/makemap ]; then
- /etc/rc.d/rc.sendmail start
-elif [ -x /etc/rc.d/rc.postfix -a -x usr/sbin/postdrop ]; then
- /etc/rc.d/rc.postfix start
-fi
-
# Load ALSA (sound) defaults:
if [ -x /etc/rc.d/rc.alsa -a -z "$container" ]; then
/etc/rc.d/rc.alsa
@@ -362,14 +349,15 @@ if [ -x /etc/rc.d/rc.keymap ]; then
/etc/rc.d/rc.keymap
fi
-# Start the MySQL database:
+# Start the MariaDB database:
if [ -x /etc/rc.d/rc.mysqld ]; then
/etc/rc.d/rc.mysqld start
fi
-# Start Apache web server:
-if [ -x /etc/rc.d/rc.httpd ]; then
- /etc/rc.d/rc.httpd start
+# Start the SASL authentication server. This provides SASL
+# authentication services for sendmail/postfix:
+if [ -x /etc/rc.d/rc.saslauthd ]; then
+ /etc/rc.d/rc.saslauthd start
fi
# Start OpenLDAP:
@@ -387,7 +375,19 @@ if [ -x /etc/rc.d/rc.dovecot ]; then
/etc/rc.d/rc.dovecot start
fi
-# Start Samba (a file/print server for Win95/NT machines).
+# Start the mail server. Try the rc.sendmail script first, then try rc.postfix.
+if [ -x /etc/rc.d/rc.sendmail -a -x usr/sbin/makemap ]; then
+ /etc/rc.d/rc.sendmail start
+elif [ -x /etc/rc.d/rc.postfix -a -x usr/sbin/postdrop ]; then
+ /etc/rc.d/rc.postfix start
+fi
+
+# Start Apache web server:
+if [ -x /etc/rc.d/rc.httpd ]; then
+ /etc/rc.d/rc.httpd start
+fi
+
+# Start Samba (a file/print server for Windows machines).
# Samba can be started in /etc/inetd.conf instead.
if [ -x /etc/rc.d/rc.samba ]; then
/etc/rc.d/rc.samba start
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 72391f0b..6c1db1c4 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:-6}
+BUILD=${BUILD:-7}
# 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