diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-31 17:57:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-31 17:57:28 +0000 |
| commit | aac80147fc296f49bf5d4fc0dfe40988619c8618 (patch) | |
| tree | 31d9439479ddf6899339766853d7d9065cc2554e | |
| parent | 24d1999db7820d4598c10146ecc9676c73825ad3 (diff) | |
If xdm was requested, but then xbase was not installed, don't try to
enable it.
ok halex
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index cd5d0adeb20..3f5f449d51a 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.563 2009/05/31 03:34:15 krw Exp $ +# $OpenBSD: install.sub,v 1.564 2009/05/31 17:57:27 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1662,7 +1662,7 @@ server $1 cp /tmp/sysctl.conf /mnt/etc/sysctl.conf fi - if [[ $xdm == y ]]; then + if [[ $xdm == y && -x /mnt/usr/X11R6/bin/xdm ]]; then echo "xdm_flags= # enabled during install" \ >>/mnt/etc/rc.conf.local fi |