summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2013-12-08 12:38:49 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2013-12-08 12:38:49 +0000
commit3d0abb1ee191e205f0f92c1879087109d89e0bec (patch)
treeb8ce2bf3d529e4c89f9b4dc13b668c8315ba5418
parentc6559b87f49b67d161e82beae245d1e9fc5ab280 (diff)
After a completed upgrade, present reboot and post-reboot instructions in a
more intuitive order: Show the 'After rebooting, run sysmerge' hint below the line that explains how to reboot, instead of several lines above. Suggested by a new user doing the first upgrade. input/ok halex@ rpe@
-rw-r--r--distrib/miniroot/install.sub7
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 98e283e2c9b..1b06d05d989 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.715 2013/12/07 09:36:10 halex Exp $
+# $OpenBSD: install.sub,v 1.716 2013/12/08 12:38:48 stsp 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
@@ -1994,9 +1994,6 @@ finish_up() {
mv /mnt/bsd.mp /mnt/bsd
fi
- [[ "$MODE" == upgrade ]] && \
- echo "After rebooting, run sysmerge(8) to update your system configuration."
-
update_firmware
# XXX To be removed after 5.6 is released.
@@ -2014,6 +2011,8 @@ using the 'mail' command.
__EOT
md_congrats
+ [[ "$MODE" == upgrade ]] && \
+ echo "After rebooting, run sysmerge(8) to update your system configuration."
$auto && >/ai.done
}