diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-07-06 21:12:06 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-07-06 21:12:06 +0000 |
| commit | 3eacb217585c597f90085619f152c6d72bc8a8df (patch) | |
| tree | 3e670e98c2cde08def5cb9c9bb50f04104ba0822 /distrib | |
| parent | 346e001836ff530936849f8f2fa95eb539c065bb (diff) | |
Remove the verbiage about manually merging 'etc' on upgrade. You get
the sysmerge(8) question now which makes it pretty obvious.
ok krw@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 10 |
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 |