From 8e734711287e3db171361903b19d2a758f325bfc Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 30 Dec 2018 20:33:37 +0000 Subject: Sun Dec 30 20:33:37 UTC 2018 a/gzip-1.10-x86_64-1.txz: Upgraded. a/lvm2-2.03.02-x86_64-1.txz: Upgraded. a/os-prober-1.77-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-24.txz: Rebuilt. rc.6: Don't umount /dev/shm or tmpfs mounts under /run as it causes long warnings/timeouts at shutdown/reboot on systems using LVM. Don't use --ignorelockingfailure when deactivating LVM. l/gc-8.0.2-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_21-x86_64-1.txz: Upgraded. l/libclc-20181127_1ecb16d-x86_64-1.txz: Upgraded. l/librsvg-2.44.11-x86_64-1.txz: Upgraded. l/zstd-1.3.8-x86_64-1.txz: Upgraded. xap/blueman-2.0.7-x86_64-1.txz: Upgraded. xap/xscreensaver-5.42-x86_64-1.txz: Upgraded. xfce/xfce4-taskmanager-1.2.2-x86_64-1.txz: Upgraded. --- source/a/sysvinit-scripts/scripts/rc.6 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/a/sysvinit-scripts/scripts/rc.6') diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index 0bbba86eb..e3986db86 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -234,9 +234,14 @@ if [ -x /etc/rc.d/rc.cgmanager ]; then /etc/rc.d/rc.cgmanager stop fi +# Umount all tmpfs mounts except /dev/shm and under /run: +cat /proc/mounts | grep " tmpfs " | grep -v -e " /run " -e " /run/" -e " /dev/shm " | while read mount ; do + umount --recursive -v $(echo $mount | cut -f 2 -d ' ') 2> /dev/null +done + # Unmount local file systems: echo "Unmounting local file systems:" -/bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse +/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 @@ -273,7 +278,7 @@ fi # Deactivate LVM volume groups: if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then echo "Deactivating LVM volume groups:" - /sbin/vgchange -an --ignorelockingfailure + /sbin/vgchange -an fi # This never hurts again (especially since root-on-LVM always fails -- cgit v1.2.3-65-gdbad