From: Lionel Sambuc <lionel.sambuc@gmail.com>
Date: Thu, 29 Oct 2015 00:50:57 +0000 (+0100)
Subject: Install xorg.conf which loads all extensions.
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=0a390218faa6ed064eba1b6aaf44605d11bae01e;p=minix.git

Install xorg.conf which loads all extensions.

Change-Id: I4592dec88703a80e8852690bb004e07e818b1753
---

diff --git a/distrib/sets/lists/minix-base/mi b/distrib/sets/lists/minix-base/mi
index a7d11c55e..99435c16a 100644
--- a/distrib/sets/lists/minix-base/mi
+++ b/distrib/sets/lists/minix-base/mi
@@ -77,6 +77,7 @@
 ./etc/X11/twm                                           minix-base      xorg
 ./etc/X11/xdm                                           minix-base      xorg
 ./etc/X11/xinit                                         minix-base      xorg
+./etc/X11/xorg.conf                                     minix-base      xorg,optional
 ./etc/X11/xserver                                       minix-base      xorg
 ./etc/X11/xsm                                           minix-base      xorg
 ./etc/boot.cfg.default                                  minix-base
diff --git a/etc/Makefile b/etc/Makefile
index 57fc24d97..5e256e0be 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -330,6 +330,11 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 	fi; \
 	${INSTALL_FILE} -o ${owner} -g ${group} -m ${mode} ${sdir}${files} ${tdir};
 .endfor
+.if ${MKX11} == "yes"
+	${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/etc/X11
+	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 ${NETBSDSRCDIR}/etc/xorg.conf \
+		${DESTDIR}/etc/X11/xorg.conf
+.endif # ${MKX11} == "yes"
 # LSC: We need a safe install target for etc files, as this is expected from
 # our current user base. This safe version only leaves out the master.passwd
 # file in order not to loose any user account created.
diff --git a/etc/xorg.conf b/etc/xorg.conf
new file mode 100644
index 000000000..c6af3cdf2
--- /dev/null
+++ b/etc/xorg.conf
@@ -0,0 +1,16 @@
+Section "Module"
+	Load  "dbe"
+	Load  "dri"
+	Load  "dri2"
+	Load  "extmod"
+	Load  "glx"
+	Load  "record"
+	Load  "shadow"
+	Load  "exa"
+	Load  "fb"
+	Load  "int10"
+	Load  "shadowfb"
+	Load  "vbe"
+	Load  "vgahw"
+	Load  "xaa"
+EndSection