summaryrefslogtreecommitdiffstats
path: root/source/installer
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-07-10 23:56:13 +0000
committer Eric Hameleers <alien@slackware.com>2019-07-11 08:59:45 +0200
commitd25041e8f5f84316e0ee350da8babdc356127bf9 (patch)
treeba8fe8ee167ca90f7531cbfb4420c3f718def80c /source/installer
parent3c8a6c83bcf500cd8a7dd77a3e55060fcf595c4c (diff)
downloadcurrent-d25041e8f5f84316e0ee350da8babdc356127bf9.tar.gz
current-d25041e8f5f84316e0ee350da8babdc356127bf9.tar.xz
Wed Jul 10 23:56:13 UTC 201920190710235613
a/glibc-zoneinfo-2019b-noarch-1.txz: Upgraded. a/kernel-generic-4.19.58-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.58-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.58-x86_64-1.txz: Upgraded. d/Cython-0.29.12-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.58-x86-1.txz: Upgraded. d/mercurial-5.0.2-x86_64-1.txz: Upgraded. d/python3-3.7.4-x86_64-1.txz: Upgraded. k/kernel-source-4.19.58-noarch-1.txz: Upgraded. l/glib2-2.60.5-x86_64-1.txz: Upgraded. n/gnupg2-2.2.17-x86_64-1.txz: Upgraded. n/iproute2-5.2.0-x86_64-1.txz: Upgraded. n/samba-4.10.6-x86_64-1.txz: Upgraded. x/libva-utils-2.5.0-x86_64-1.txz: Upgraded. x/mesa-19.1.2-x86_64-1.txz: Upgraded. xap/mozilla-firefox-68.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. Some of the patched flaws are considered critical, and could be used to run attacker code and install software, requiring no user interaction beyond normal browsing. For more information, see: https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html https://www.mozilla.org/en-US/security/advisories/mfsa2019-22/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9811 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11711 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11712 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11713 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11729 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11715 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11717 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11719 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11730 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11709 (* Security fix *) xap/mozilla-thunderbird-60.8.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/60.8.0/releasenotes/ xfce/garcon-0.6.3-x86_64-2.txz: Rebuilt. Patched crash bug. Installed gtk-doc HTML docs. Thanks to Robby Workman. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/blueman-2.1.1-x86_64-1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/installer')
-rw-r--r--source/installer/ChangeLog.txt4
-rwxr-xr-xsource/installer/build_installer.sh14
2 files changed, 18 insertions, 0 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 8feca1529..3f47f5ec7 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Wed Jul 10 22:33:27 UTC 2019
+ /sbin/reboot: shell script to call the real reboot with "reboot -f" to
+ prevent a reboot hang after installation.
++--------------------------+
Sat Apr 27 19:53:20 UTC 2019
build_installer.sh: remove final dangling symlink check. This gets into
a filesystem loop that takes a bit of time, and has never turned up any
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index e9bcac8c2..2b0cf1d08 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -996,6 +996,20 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_SBIN} \
cp --remove-destination -fa${VERBOSE1} fdisk \
$PKG/$ARCH-installer-filesystem/sbin/fdisk.bin
+# Hack reboot to call reboot -f:
+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
+sync
+if [ -z "\$*" ]; then
+ /bin/reboot -f
+else
+ /bin/reboot \$*
+fi
+EOF
+chmod 755 $PKG/$ARCH-installer-filesystem/sbin/reboot
+
# Copy binaries from /usr/bin into the installer's /usr/bin/
cd $TMP/extract-packages/usr/bin
cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \