summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2021-09-13 11:49:23 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2021-09-13 11:49:23 +0000
commit6b5347687ac417958a38c72a3e863239ccd70960 (patch)
treea0466977ded08ec4c49230bf1b9deef207838876 /distrib/miniroot/install.sub
parentbb856ab86ed178913d17dfeb0518f9333ea8c518 (diff)
introduce /etc/bsd.re-config which can be used to configure the kernel
using config(8); the contents of this configuration file will be fed to config(8) after kernel relinking is done, so on the next boot the new kernel will have all the configuration changes set by the user this comes handy if you still want to use KARL while making changes to the GENERIC kernel diff from Paul de Weerd with input from several developers
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub7
1 files changed, 5 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index d369abd0b58..e77191ea7bb 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1177 2021/09/13 05:17:04 robert Exp $
+# $OpenBSD: install.sub,v 1.1178 2021/09/13 11:49:21 robert Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2858,7 +2858,10 @@ finish_up() {
tar -C $_kernel_dir -xzf $_kernel_dir.tgz $_kernel
rm -f $_kernel_dir.tgz
chroot /mnt /bin/ksh -e -c "cd ${_kernel_dir#/mnt}/$_kernel; \
- make newbsd; make newinstall"
+ make newbsd; \
+ [ -f /etc/bsd.re-config ] && \
+ config -e -c /etc/bsd.re-config -f bsd; \
+ make newinstall"
) >/dev/null 2>&1 && echo " done." || echo " failed."
fi