diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-03-02 01:24:51 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-03-02 01:24:51 +0000 |
| commit | a23f4e2efb08988c1a3faf6926c4b66907a0e47a (patch) | |
| tree | 9d175a65c0b52edc50900ca0cafb81ac9d174f99 | |
| parent | 9699851e8016381c1825dd2edccba24a6cea4355 (diff) | |
The -stable default ftp directory should not be snapshots/$ARCH.
The normal release directory is a less surprising default.
Suggested by henning@ a while ago. Working script incantation
courtesy of several cluebats from halex@. No strong opposition.
ok deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index b78230bcd4c..77f06bba2a6 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.596 2010/01/13 00:15:26 todd Exp $ +# $OpenBSD: install.sub,v 1.597 2010/03/02 01:24:50 krw 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 @@ -1867,8 +1867,8 @@ dmesg | sed -ne '/^OpenBSD /h;/^OpenBSD /!H;${g;p;}' >/var/run/dmesg.boot # Are we in a real release, or a snapshot? If this is a snapshot # install media, default us to a snapshot directory. FTPSETDIR=$SETDIR -CURRENT=$(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p") -[[ -n $CURRENT ]] && FTPSETDIR=snapshots/$ARCH +set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p") +[[ $1 == -!(stable) ]] && FTPSETDIR=snapshots/$ARCH # Scan /var/run/dmesg.boot for interesting devices. MTDEVS=$(scan_dmesg "${MDMTDEVS:-/^[cms]t[0-9][0-9]* /s/ .*//p}") |