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 a7d11c55e8e64987e88c34a6b43641756023fc65..99435c16a8aa3236f3affc3a14282b7febd6e07d 100644 (file)
--- 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 57fc24d97e4cadc399eb55ca8ead853274137c27..5e256e0bedb7d2c76dc218cb5a27fbcdc50ab14e 100644 (file)
--- 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 (file)
index 0000000..c6af3cd
--- /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