summaryrefslogtreecommitdiffstats
path: root/source/a/sysvinit-scripts/scripts
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-08-28 21:29:41 +0000
committer Eric Hameleers <alien@slackware.com>2019-08-29 08:59:47 +0200
commit4dce2a46ca603e244644b58f7e18cf6af37589c3 (patch)
tree2c63017affffa9d5bafa32b753a89b743e372c43 /source/a/sysvinit-scripts/scripts
parentcc5195c37e13a9ffec9980276168266320ef4e41 (diff)
downloadcurrent-4dce2a46ca603e244644b58f7e18cf6af37589c3.tar.gz
current-4dce2a46ca603e244644b58f7e18cf6af37589c3.tar.xz
Wed Aug 28 21:29:41 UTC 201920190828212941
a/haveged-1.9.6-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-27.txz: Rebuilt. rc.6, rc.K: recognize partition type nfs4 Thanks to Yoga the Yogin. ap/gutenprint-5.3.3-x86_64-1.txz: Upgraded. ap/hplip-3.19.8-x86_64-1.txz: Upgraded. ap/man-db-2.8.7-x86_64-1.txz: Upgraded. d/meson-0.51.2-x86_64-1.txz: Upgraded. d/ruby-2.6.4-x86_64-1.txz: Upgraded. n/dovecot-2.3.7.2-x86_64-1.txz: Upgraded. n/php-7.3.9-x86_64-1.txz: Upgraded. This update fixes bugs and a security issue: MBString: Fixed bug #78380 (Oniguruma 6.9.3 fixes CVEs). (CVE-2019-13224) For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-13224 (* Security fix *)
Diffstat (limited to 'source/a/sysvinit-scripts/scripts')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.66
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.K4
2 files changed, 5 insertions, 5 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index e3986db86..405773d10 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -124,7 +124,7 @@ fi
# Kill any processes (typically gam) that would otherwise prevent
# unmounting NFS volumes:
unset FUSER_DELAY
-for dir in $(/bin/mount | grep 'type nfs ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do
+for dir in $(/bin/mount | grep -e 'type nfs ' -e 'type nfs4 ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do
echo "Killing processes holding NFS mount $dir open..."
# Background this to prevent fuser from also blocking shutdown:
/usr/bin/fuser -k -M -m "$dir" &
@@ -137,7 +137,7 @@ fi
# Unmount any NFS, SMB, or CIFS filesystems:
echo "Unmounting remote filesystems:"
-/bin/umount -v -a -l -f -r -t nfs,smbfs,cifs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g"
+/bin/umount -v -a -l -f -r -t nfs,nfs4,smbfs,cifs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g"
# Try to shut down pppd:
PS="$(ps ax)"
@@ -156,7 +156,7 @@ fi
# Bring down the networking system, but first make sure that this
# isn't a diskless client with the / partition mounted via NFS:
-if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then
+if ! /bin/mount | /bin/grep -q -e 'on / type nfs' -e 'on / type nfs4' ; then
if [ -x /etc/rc.d/rc.inet1 ]; then
/etc/rc.d/rc.inet1 stop
fi
diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K
index b8ed352da..4ea4b8845 100644
--- a/source/a/sysvinit-scripts/scripts/rc.K
+++ b/source/a/sysvinit-scripts/scripts/rc.K
@@ -60,7 +60,7 @@ fi
# Kill any processes (typically gam) that would otherwise prevent
# unmounting NFS volumes:
unset FUSER_DELAY
-for dir in $(/bin/mount | grep 'type nfs ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do
+for dir in $(/bin/mount | grep -e 'type nfs ' -e 'type nfs4 ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do
echo "Killing processes holding NFS mount $dir open..."
# Background this to prevent fuser from also blocking shutdown:
/usr/bin/fuser -k -M -m "$dir" &
@@ -73,7 +73,7 @@ fi
# Unmount any NFS, SMB, or CIFS filesystems:
echo "Unmounting remote filesystems:"
-/bin/umount -v -a -l -f -r -t nfs,smbfs,cifs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g"
+/bin/umount -v -a -l -f -r -t nfs,nfs4,smbfs,cifs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g"
# Shut down PCMCIA devices:
if [ -x /etc/rc.d/rc.pcmcia ] ; then