diff options
| author |   krw <krw@openbsd.org> | 2015-12-02 21:17:16 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-12-02 21:17:16 +0000 |
| commit | 639974968b3888a5efe66976aef7d47c0f64903f (patch) | |
| tree | 99ff96a21f94e2f93e1ea7bf0e481229d883a809 /distrib/i386 | |
| parent | in response to EHLO, don't offer STARTTLS if we already completed the (diff) | |
| download | wireguard-openbsd-639974968b3888a5efe66976aef7d47c0f64903f.tar.xz wireguard-openbsd-639974968b3888a5efe66976aef7d47c0f64903f.zip | |
If (O)penBSD is not offered as a partitioning option, do not accept
'O*|o*' as a valid response. Ignore it as we do other invalid input.
armv7 is special case to be handled separately.
Noticed by kettenis@.
ok deraadt@ rpe@
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/common/install.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index aa4c7418971..be572ae0e41 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.66 2015/11/09 20:54:12 rpe Exp $ +# $OpenBSD: install.md,v 1.67 2015/12/02 21:17:17 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -81,7 +81,9 @@ __EOT fdisk -e ${_disk} fdisk $_disk | grep -q ' A6 ' && return echo No OpenBSD partition in MBR, try again. ;; - o*|O*) return ;; + o*|O*) + [[ $_d == OpenBSD ]] || continue + return ;; esac done } |