Originally, the installer executed the {install,upgrade}.site script
at the end of installs and upgrades. Over time, code was after this
step and now a list of things happen AFTER this script is executed.
- make underlying device nodes for softraid devices
- install the boot-block on disk
- switch to MP kernel on multi-processor systems
- update kernel.SHA256
- relink kernel
- prepare execution of sysmerge in batch mode on reboot
- prepare execution of fw_update on reboot
- prepare mail with response file to root/admin user
This diff moves the execution of the {install,upgrade}.site script
to the end of the install/upgrade process again.
--------------------------------------------------------------------
NOTE: If you use the {install,upgrade}.site functionality, make sure
your script still works as expected.
--------------------------------------------------------------------
Index: install.sub
===================================================================
RCS file: /cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.1024
diff -u -p -p -u -r1.1024 install.sub
--- install.sub 17 Jul 2017 18:02:31 -0000 1.1024
+++ install.sub 17 Jul 2017 18:18:17 -0000
@@ -2639,8 +2639,6 @@ finish_up() {
)
fi
- [[ -x /mnt/$MODE.site ]] && chroot /mnt /$MODE.site
-
# In case this is a softraid device, make sure all underlying
# device nodes exist before installing boot-blocks on disk.
make_dev $(bioctl $ROOTDISK 2>/dev/null | sed -n 's/.*<\(.*\)>$/\1/p')
@@ -2680,6 +2678,8 @@ finish_up() {
# Email installer questions and their answers to root on next boot.
prep_root_mail /tmp/i/$MODE.resp "$(hostname) $MODE response file"
+
+ [[ -x /mnt/$MODE.site ]] && chroot /mnt /$MODE.site
# Store entropy for the next boot.
store_random
--
-=[rpe]=-
