From da18a68d9ed8b817c7ecffb3b260d61537271671 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 10 Jan 2010 13:32:57 +0000
Subject: remove and move some chatty byte during upgrade startup; ok krw, idea
 from mcbride

---
 distrib/miniroot/dot.profile | 14 +++-----------
 distrib/miniroot/upgrade.sh  | 10 +++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'distrib')

diff --git a/distrib/miniroot/dot.profile b/distrib/miniroot/dot.profile
index 0442e5cb240..3bac832dfb3 100644
--- a/distrib/miniroot/dot.profile
+++ b/distrib/miniroot/dot.profile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.profile,v 1.13 2009/06/12 03:30:00 deraadt Exp $
+#	$OpenBSD: dot.profile,v 1.14 2010/01/10 13:32:56 deraadt Exp $
 #	$NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
 #
 # Copyright (c) 2009 Kenneth R. Westerback
@@ -64,17 +64,9 @@ __EOT
 	while :; do
 		read REPLY?'(I)nstall, (U)pgrade or (S)hell? '
 		case $REPLY in
-		i*|I*)	echo "\nCool! Let's get to it.\n"
-			/install && break
+		i*|I*)	/install && break
 			;;
-		u*|U*)	cat <<__EOT
-
-NOTE: Once your system has been upgraded, you must manually merge any
-changes to files in the 'etc' set into the files already on your system.
-sysmerge(8) can help.
-
-__EOT
-			/upgrade && break
+		u*|U*)	/upgrade && break
 			;;
 		s*|S*)	break
 			;;
diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh
index 4ea36594393..fce9e48fa3f 100644
--- a/distrib/miniroot/upgrade.sh
+++ b/distrib/miniroot/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: upgrade.sh,v 1.69 2009/05/06 01:29:48 deraadt Exp $
+#	$OpenBSD: upgrade.sh,v 1.70 2010/01/10 13:32:56 deraadt Exp $
 #	$NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $
 #
 # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -43,6 +43,14 @@ MODE=upgrade
 # include common subroutines and initialization code
 . install.sub
 
+cat <<__EOT
+
+NOTE: Once your system has been upgraded, you must manually merge any
+changes to files in the 'etc' set into the files already on your system.
+sysmerge(8) can help.
+
+__EOT
+
 # Have the user confirm that $ROOTDEV is the root filesystem.
 while :; do
 	ask "Root filesystem?" $ROOTDEV
-- 
cgit v1.2.3