diff options
| author |   rpe <rpe@openbsd.org> | 2016-09-22 20:45:22 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2016-09-22 20:45:22 +0000 |
| commit | 6d74b2be4b74582e6029bc88ff8a59e29fc204af (patch) | |
| tree | d1ba5d84164f2d29ab62495a03fa83bf2b9d185c | |
| parent | Add aeabi aliases. (diff) | |
| download | wireguard-openbsd-6d74b2be4b74582e6029bc88ff8a59e29fc204af.tar.xz wireguard-openbsd-6d74b2be4b74582e6029bc88ff8a59e29fc204af.zip | |
vi is not available on the install media.
Besides ... real men use ed!
OK krw halex deraadt
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 8947bd9c54d..907f800d162 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.920 2016/09/16 15:35:05 krw Exp $ +# $OpenBSD: install.sub,v 1.921 2016/09/22 20:45:22 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2891,9 +2891,7 @@ SANESETS="${SANESETS:-bsd} base${VERSION}.tgz" COLUMNS=$(stty -a </dev/console | sed -n '/columns/{s/^.* \([0-9]*\) columns.*$/\1/;p;}') ((COLUMNS == 0)) && COLUMNS=80 -# Decide upon an editor. -: ${EDITOR:=ed} -[[ -x /usr/bin/vi ]] && EDITOR=vi +EDITOR=ed export EDITOR COLUMNS # umount all filesystems, just in case we are re-running install or upgrade. |