diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-03-23 23:29:17 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-03-23 23:29:17 +0000 |
| commit | 0574e0c87b262f5d593f009736f1e9150078eca0 (patch) | |
| tree | 4b8bc6e3fde6b3ae0394ef75989f031ad2df644b | |
| parent | 603aa0f926e45c12da2f434923b986417edffa13 (diff) | |
Disable the ability to (U)pgrade a sparc64 installation.
Requested by deraadt@ for the 3.1 release.
ok deraadt@
| -rw-r--r-- | distrib/notes/sparc64/install | 7 | ||||
| -rw-r--r-- | distrib/sparc64/common/dot.profile | 9 | ||||
| -rw-r--r-- | distrib/sparc64/common/list | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install index 0d8cdaeb93e..df615dccbff 100644 --- a/distrib/notes/sparc64/install +++ b/distrib/notes/sparc64/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.17 2002/02/07 08:57:28 miod Exp $ +dnl $OpenBSD: install,v 1.18 2002/03/23 23:29:16 krw Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -129,8 +129,9 @@ OpenBSDBootMsgs (If your terminal type is xterm, just use vt100). After entering the terminal type you will be asked whether you - wish to do an "(I)nstall" or an "(U)pgrade". Enter 'I' for a - fresh install or 'U' to upgrade an existing installation. + wish to do an "(I)nstall". Enter 'I' for a fresh installation. + Note that you cannot upgrade a previous OpenBSD installation + to 3.1. You will be presented with a welcome message and asked if you really want to continue. Assuming you answered yes, the diff --git a/distrib/sparc64/common/dot.profile b/distrib/sparc64/common/dot.profile index e696a3a1128..f16dfde50cf 100644 --- a/distrib/sparc64/common/dot.profile +++ b/distrib/sparc64/common/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.2 2001/12/05 19:50:46 deraadt Exp $ +# $OpenBSD: dot.profile,v 1.3 2002/03/23 23:29:16 krw Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -45,17 +45,14 @@ if [ "X${DONEPROFILE}" = "X" ]; then # Installing or upgrading? _forceloop="" while [ "X$_forceloop" = X"" ]; do - echo -n '(I)nstall, (U)pgrade or (S)hell? ' + # No (U)pgrade possible for 3.1 Sparc64 + echo -n '(I)nstall or (S)hell? ' read _forceloop case "$_forceloop" in i*|I*) /install ;; - u*|U*) - /upgrade - ;; - s*|S*) ;; diff --git a/distrib/sparc64/common/list b/distrib/sparc64/common/list index c2b71bc8cf4..4411c2412ab 100644 --- a/distrib/sparc64/common/list +++ b/distrib/sparc64/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.5 2001/12/17 00:41:51 krw Exp $ +# $OpenBSD: list,v 1.6 2002/03/23 23:29:16 krw Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -58,7 +58,7 @@ COPY ${CURDIR}/../../miniroot/services etc/services # and the installation scripts COPY ${CURDIR}/../../miniroot/install.sub install.sub COPY ${CURDIR}/../../miniroot/install.sh install -COPY ${CURDIR}/../../miniroot/upgrade.sh upgrade +# No (U)pgrade option for 3.1 on Sparc64 SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub SPECIAL chmod 755 install upgrade |