diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2015-11-20 14:41:49 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2015-11-20 14:41:49 +0000 |
| commit | 6cc52f794f8a5c327f7899600df14cd659478845 (patch) | |
| tree | d4e3dab00e0dcd805eb85ee443eb3adf7c3f03c3 /distrib | |
| parent | ef182b535200cab876d75c98a1f687bee3b30b18 (diff) | |
don't auto-skip X sets on systems without wscons, you can remove them easily
with -x*, and "no wscons" doesn't cover all of the systems where one might
intentionally want to skip them anyway. ok bmercer deraadt espie rpe
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index dc92785ce02..6f8fd8f510c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.859 2015/11/18 17:48:45 sthen Exp $ +# $OpenBSD: install.sub,v 1.860 2015/11/20 14:41:48 sthen Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1125,10 +1125,6 @@ install_files() { for _f in $THESETS; do isin $_f $_files || continue; _sets=$(addel $_f $_sets) - # No displays and X isn't installed ==> skip X sets. - [[ -z $DISPLAY && ! -d /mnt/etc/X11 ]] && - isin ${_f%${VERSION}.tgz} xbase xshare xfont xserv && - continue isin $_f $DEFAULTSETS "site$VERSION-$(hostname -s).tgz" && _get_sets=$(addel $_f $_get_sets) done |