diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2015-03-17 15:21:03 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2015-03-17 15:21:03 +0000 |
| commit | 8f1f3bebdd8a5303bb242a3d4f83f99378719b32 (patch) | |
| tree | 22cc69415ce2791c0428c4ca204d1370b4ebb1d3 /distrib | |
| parent | 8be8e2aa4ba17866f95da731e02922c373a06116 (diff) | |
Restore previous behaviour that got lost with 1.780.
Don't ask about xdm if the answer to the X question was no.
Noted by mlarkin@
"Looks good" deraadt@
OK krw@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 02fdc6300e8..390e5fd80cd 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.818 2015/03/15 00:09:50 krw Exp $ +# $OpenBSD: install.sub,v 1.819 2015/03/17 15:21:02 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1879,13 +1879,14 @@ questions() { fi aperture= + resp= xdm= if [[ -n $DISPLAY ]]; then if [[ -n $(scan_dmesg '/^[a-z]*[01]: aperture needed/p') ]]; then ask_yn "Do you expect to run the X Window System?" yes && aperture=$MDXAPERTURE fi - if [[ -n $MDXDM ]]; then + if [[ -n $MDXDM && $resp != n ]]; then ask_yn "Do you want the X Window System to be started by xdm(1)?" xdm=$resp fi |