From ba4217f7183fb76ae1774062c06ae5d77cc1b2f7 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 13 Jan 2020 00:11:55 +0000
Subject: Mon Jan 13 00:11:55 UTC 2020

a/elvis-2.2_0-x86_64-5.txz:  Rebuilt.
  Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz:  Upgraded.
a/nvi-1.81.6-x86_64-1.txz:  Added.
  This is an implementation of the classic ex/vi text editor written by Keith
  Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
  take over the ex/vi symlinks if they aren't already pointing to a different
  choice. Note that the removal of vi/ex symlinks from the elvis and vim
  packages might cause your ex/vi symlinks to point to this after all the ex/vi
  packages have been upgraded. You can set them to your preferences using
  pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz:  Rebuilt.
  Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz:  Upgraded.
  Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz:  Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.11-noarch-1.txz:  Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz:  Upgraded.
n/ethtool-5.4-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/installer/ChangeLog.txt      |  4 ++++
 source/installer/build_installer.sh | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

(limited to 'source/installer')

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 56a049e1..65c91858 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Sun Jan 12 20:36:57 UTC 2020
+  /sbin/reboot: Attempt to kill running processes and sync/umount/sync
+  filesystems before rebooting. Thanks to Jeebizz.
++--------------------------+
 Mon Dec 30 20:05:46 UTC 2019
   SeTEFI: Patched to remove extra whitespace from lsblk output.
   Thanks to Didier Spaier.
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index e980207a..755efe47 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1003,7 +1003,22 @@ rm -f $PKG/$ARCH-installer-filesystem/sbin/reboot
 ( cd $PKG/$ARCH-installer-filesystem/bin ; ln -sf busybox reboot )
 cat << EOF > $PKG/$ARCH-installer-filesystem/sbin/reboot
 #!/bin/sh
+echo "Sending all processes the SIGTERM signal."
+/sbin/killall5 -15
+/bin/sleep 2
+echo "Sending all processes the SIGKILL signal."
+/sbin/killall5 -9
+/bin/sleep 2
+echo "Syncing filesystems."
 sync
+echo "Unmounting filesystems:"
+# Try to unmount these bind mounts first to prevent them from blocking unmount of the target /:
+umount /mnt/dev 2> /dev/null
+umount /mnt/proc 2> /dev/null
+umount /mnt/sys 2> /dev/null
+/bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse,tmpfs
+sync
+echo "Rebooting."
 if [ -z "\$*" ]; then
   /bin/reboot -f
 else
-- 
cgit v1.2.3