diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-07-19 18:26:45 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-07-20 08:59:50 +0200 |
commit | 3db41f6c7650f0cff2bb0010c9db60bfb74e6b02 (patch) | |
tree | 9281976b0f7db8ddbea01190471bcbfa939bc4df /source/ap/lxc/scripts/rc.6.lxc | |
parent | 612d5685be4b6dc368aa4d02e96ead63bdb6e904 (diff) | |
download | current-3db41f6c7650f0cff2bb0010c9db60bfb74e6b02.tar.gz |
Fri Jul 19 18:26:45 UTC 201920190719182645
a/aaa_elflibs-15.0-x86_64-9.txz: Rebuilt.
Upgraded: libbz2.so.1.0.8, libexpat.so.1.6.9, libglib-2.0.so.0.6000.5,
libgmodule-2.0.so.0.6000.5, libgobject-2.0.so.0.6000.5,
libgthread-2.0.so.0.6000.5, libidn2.so.0.3.6.
Removed: libicudata.so.63.1, libicui18n.so.63.1, libicuio.so.63.1,
libicutest.so.63.1, libicutu.so.63.1, libicuuc.so.63.1.
Added: libpcre2-8.so.0.8.0, libpsl.so.5.3.2. These are needed by wget which
is used by slackpkg, so they should be in here. Thanks to OutSiderBR.
ap/lxc-2.0.11_fad08f383-x86_64-1.txz: Upgraded.
Updated from 2.0 git branch.
Ported init script updates from sysvinit-scripts.
d/ccache-3.7.2-x86_64-1.txz: Upgraded.
l/libsigc++-2.10.2-x86_64-1.txz: Upgraded.
n/curl-7.65.3-x86_64-1.txz: Upgraded.
This is a bugfix release:
Fix a regression that caused the progress meter not to appear.
For more information, see:
https://curl.haxx.se/changes.html
n/iputils-20190709-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/lxc/scripts/rc.6.lxc')
-rw-r--r-- | source/ap/lxc/scripts/rc.6.lxc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source/ap/lxc/scripts/rc.6.lxc b/source/ap/lxc/scripts/rc.6.lxc index 7fd57ef2..73923da9 100644 --- a/source/ap/lxc/scripts/rc.6.lxc +++ b/source/ap/lxc/scripts/rc.6.lxc @@ -44,6 +44,10 @@ case "$0" in ;; esac +# Restart init. This prevents init from hanging on to file handles for removed +# glibc shared libraries in the case that those were upgraded or reinstalled. +/sbin/telinit u + # Save the system time to the hardware clock using hwclock --systohc. # This will also create or update the timestamps in /etc/adjtime. if [ -x /sbin/hwclock -a -z "$container" ]; then @@ -114,6 +118,11 @@ if [ -x /etc/rc.d/rc.openldap ]; then /etc/rc.d/rc.openldap stop fi +# Stop the haveged entropy daemon: +if [ -x /etc/rc.d/rc.haveged -a -z "$container" ]; then + /etc/rc.d/rc.haveged stop +fi + # Stop D-Bus: if [ -x /etc/rc.d/rc.messagebus ]; then /etc/rc.d/rc.messagebus stop @@ -122,10 +131,10 @@ fi # Kill any processes (typically gam) that would otherwise prevent # unmounting NFS volumes: unset FUSER_DELAY -for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do +for dir in $(/bin/mount | grep 'type nfs ' | 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 $dir & + /usr/bin/fuser -k -M -m "$dir" & FUSER_DELAY=5 done # If fuser was run, let it have some delay: @@ -236,7 +245,11 @@ fi if [ -z "$container" ]; then echo "Unmounting local file systems:" - /bin/umount -v -a -t no,proc,sysfs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g" 2> /dev/null + /bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse,tmpfs + # JFS needs a sync here or the / partition cannot be remounted read-only. + # In spite of this, it seems that a JFS root partition will always be checked + # (and found to be clean) at boot: + /bin/sync echo "Remounting root filesystem read-only:" /bin/mount -v -n -o remount,ro / fi @@ -269,7 +282,7 @@ fi if [ -z "$container" ]; then if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then echo "Deactivating LVM volume groups:" - /sbin/vgchange -an --ignorelockingfailure + /sbin/vgchange -an fi fi |