summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrpe <rpe@openbsd.org>2015-03-21 21:13:52 +0000
committerrpe <rpe@openbsd.org>2015-03-21 21:13:52 +0000
commitc800a6e60c0b924b9d6c2bd0ce2689bb3d1083e2 (patch)
tree08eaa22fdad77430cf0d3bfa757d52c8fcdcda82
parentAdd support for saving/restoring FPU state using the XSAVE/XRSTOR. Limit (diff)
downloadwireguard-openbsd-c800a6e60c0b924b9d6c2bd0ce2689bb3d1083e2.tar.xz
wireguard-openbsd-c800a6e60c0b924b9d6c2bd0ce2689bb3d1083e2.zip
Fold the single command from update_firmware() into finish_up()
and remove the update_firmware() function all together. OK halex@ krw@
-rw-r--r--distrib/miniroot/install.sub9
1 files changed, 3 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 6f4a5d4509a..6144cb5e800 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.821 2015/03/21 18:27:39 rpe Exp $
+# $OpenBSD: install.sub,v 1.822 2015/03/21 21:13:52 rpe Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# All rights reserved.
@@ -1582,10 +1582,6 @@ install_sets() {
done
}
-update_firmware() {
- 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
#
@@ -1918,7 +1914,8 @@ finish_up() {
mv /mnt/bsd.mp /mnt/bsd
fi
- update_firmware
+ # Ensure that fw_update is run on reboot.
+ echo "/usr/sbin/fw_update -v" >>/mnt/etc/rc.firsttime
store_random