From: Schantl Stefan <Stevee@ipfire.org>
Date: Fri, 27 Aug 2010 12:42:36 +0000 (+0200)
Subject: xorg-server: Add default xorg.conf to load needed modules.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=629b98633df10f07d289a9a7ca6301b9a2897d30;p=ipfire-3.x.git

xorg-server: Add default xorg.conf to load needed modules.

We are using a BIND_NOW feature from the GNU ld, so the xorg server can't load the modules automatically and we had to load them manually.

This fixes #49.
---

diff --git a/pkgs/core/xorg-server/xorg-server.nm b/pkgs/core/xorg-server/xorg-server.nm
index 93cde25f4..1e65088a1 100644
--- a/pkgs/core/xorg-server/xorg-server.nm
+++ b/pkgs/core/xorg-server/xorg-server.nm
@@ -101,4 +101,6 @@ define STAGE_INSTALL
 		$(BUILDROOT)/usr/share/xorg/
 	cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/10-quirks.conf \
 		$(BUILDROOT)/usr/share/X11/xorg.conf.d
+	cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/xorg.conf \
+                $(BUILDROOT)/etc/X11/
 endef
diff --git a/pkgs/core/xorg-server/xorg.conf b/pkgs/core/xorg-server/xorg.conf
new file mode 100644
index 000000000..684cf4aac
--- /dev/null
+++ b/pkgs/core/xorg-server/xorg.conf
@@ -0,0 +1,26 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+Section "Module"
+	Load "int10"
+	Load "vbe"
+	Load "fb"
+	Load "shadow"
+EndSection