diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-25 05:46:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-25 05:46:45 +0000 |
| commit | 1011b8dcc532523c9f2f4e600beff5511ecbb399 (patch) | |
| tree | 3a9a94044151b1faba8205433e1030f3eef63d14 /distrib | |
| parent | 286f3c5ef737a689774eafa1364d6322efde0870 (diff) | |
If any of the X sets is missing, there is no point in asking the X questions
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index c9435029bde..92d30cd5438 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.480 2009/04/25 03:53:54 deraadt Exp $ +# $OpenBSD: install.sub,v 1.481 2009/04/25 05:46:44 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -1549,6 +1549,13 @@ populateusrlocal() { xquestions() { local _xdmask=y + # If any of the X11 sets are missing, then no need to enable X + for i in xbase xetc xshare xfont xserv; do + if ! isin $i${VERSION}.tgz $GOTSETS; then + return + fi + done + # XXX if any of the X sets are not installed, we should # not ask these questions if [[ -n $MDXAPERTURE ]]; then |