summaryrefslogtreecommitdiffstats
path: root/source/installer
diff options
context:
space:
mode:
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} \