summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Hall <halex@cvs.openbsd.org>2011-07-09 01:20:38 +0000
committerAlexander Hall <halex@cvs.openbsd.org>2011-07-09 01:20:38 +0000
commit462e16bede2f5559d4d01a1649b811abb4d51974 (patch)
tree3a0ca253e88568bf5c28e92ee95dd66cc888d04e
parentb17b8f3e9d955448a7c956804f6213a552e1f293 (diff)
Ask to install non-free firmwares at first boot
"go ahead" deraadt@
-rw-r--r--distrib/miniroot/install.sub12
1 files changed, 11 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 0c1517fdb86..4b0460c0fd5 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.642 2011/07/06 23:38:41 halex Exp $
+# $OpenBSD: install.sub,v 1.643 2011/07/09 01:20:37 halex Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1638,6 +1638,14 @@ run_sysmerge() {
fi
}
+update_firmwares() {
+ local _get=Install
+ [[ $MODE == upgrade ]] && _get=Update
+ ask_yn "$_get non-free firmwares on first boot?" no
+ [[ $resp == y ]] && \
+ echo '/usr/sbin/fw_update -v' >> /mnt/etc/rc.firsttime
+}
+
# Create a skeletal but useful /etc/fstab from /tmp/fstab by stripping all
# comment lines and dropping all filesystems which
#
@@ -1973,6 +1981,8 @@ finish_up() {
[[ "$MODE" == upgrade ]] && run_sysmerge
+ update_firmwares
+
# Pat on the back.
cat <<__EOT