From: kettenis <kettenis@openbsd.org>
Date: Mon, 28 Jul 2014 14:12:14 +0000 (+0000)
Subject: Avoid matching a particular driver for "aperture needed" detection.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0c8ec8cd5d3a737ebec9e467ebc860117fe2b378;p=openbsd

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@
---

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