summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/miniroot/upgrade.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh
index fce9e48fa3f..20bb51c6a22 100644
--- a/distrib/miniroot/upgrade.sh
+++ b/distrib/miniroot/upgrade.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: upgrade.sh,v 1.70 2010/01/10 13:32:56 deraadt Exp $
+# $OpenBSD: upgrade.sh,v 1.71 2011/07/06 21:12:05 ajacoutot 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,14 +43,6 @@ 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