diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2014-07-28 14:12:15 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2014-07-28 14:12:15 +0000 |
| commit | 60d95225248225647acfbf1ab5e6b4084b90bf1a (patch) | |
| tree | 4dfa3aa4b21dd39202f74d670b52e15b3c621095 /distrib | |
| parent | 8b615f84149f0dc3e69dccaa73bb1a8e505d0fc2 (diff) | |
Avoid matching a particular driver for "aperture needed" detection.
On sparc64 we also need to match machfb(4) in addition to vgafb(4) so let's
just match any driver.
ok halex@, deraadt@
Diffstat (limited to 'distrib')
| -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 e40fdd956ba..21b0e71ce9c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.787 2014/07/28 05:42:26 rpe Exp $ +# $OpenBSD: install.sub,v 1.788 2014/07/28 14:12:14 kettenis Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1854,7 +1854,7 @@ questions() { xdm= lidsuspend= if [[ -n $DISPLAY ]]; then - if [[ -n $(scan_dmesg '/^vga.*: aperture needed/p') ]]; 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 |