Allowing xorg.conf overrides in /usr/share/live/config/xserver-xorg files.

diff --git a/Makefile b/Makefile
index 81ba2b4..e0f383d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,10 @@ install:
 
        mkdir -p $(DESTDIR)/sbin
 
+       # Installing shared data
+       mkdir -p $(DESTDIR)/usr/share/live/config
+       cp -r VERSION share/* $(DESTDIR)/usr/share/live/config
+
        # Installing docs
        mkdir -p $(DESTDIR)/usr/share/doc/live-config
        cp -r COPYING examples $(DESTDIR)/usr/share/doc/live-config
@@ -119,6 +123,10 @@ uninstall:
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib > /dev/null 2>&1 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/var > /dev/null 2>&1 || true
 
+       # Uninstalling shared data
+       rm -rf $(DESTDIR)/usr/share/live/config
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live
+
        # Uninstalling docs
        rm -rf $(DESTDIR)/usr/share/doc/live-config
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true

diff --git a/debian/live-config.install b/debian/live-config.install
index 36b9f4d..ee66d69 100644 (file)
--- a/debian/live-config.install
+++ b/debian/live-config.install
@@ -1,3 +1,4 @@
 sbin
 lib
+usr/share/live
 var

diff --git a/scripts/config/1150-xserver-xorg b/scripts/config/1150-xserver-xorg
index 050204a..03493bc 100755 (executable)
--- a/scripts/config/1150-xserver-xorg
+++ b/scripts/config/1150-xserver-xorg
@@ -144,29 +144,23 @@ Configure_xserver_xorg ()
 
        if [ -n "${LIVE_XORG_DRIVER}" ]
        then
-
                mkdir -p /etc/X11/xorg.conf.d
 
+               if [ -e "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" ]
+               then
+                       # xorg-driver manual overrides
+                       cp "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" /etc/X11/xorg.conf.d/99-live.conf
+               else
+
 cat > /etc/X11/xorg.conf.d/99-live.conf << EOF
 Section "Device"
        Identifier      "Default screen"
        Driver          "${LIVE_XORG_DRIVER}"
-EOF
-
-case "${LIVE_XORG_DRIVER}" in
-       nvidia)
-
-cat >> /etc/X11/xorg.conf.d/99-live.conf << EOF
-       Option          "NoLogo"        "true"
-EOF
-
-               ;;
-esac
-
-cat >> /etc/X11/xorg.conf.d/99-live.conf << EOF
 EndSection
 EOF
 
+               fi
+
                case "${LIVE_XORG_DRIVER}" in
                        nvidia)
                                # wheezy

diff --git a/share/xserver-xorg/nvidia.conf b/share/xserver-xorg/nvidia.conf
new file mode 100644 (file)
index 0000000..746de42
--- /dev/null
+++ b/share/xserver-xorg/nvidia.conf
@@ -0,0 +1,5 @@
+Section "Device"
+       Identifier      "Default screen"
+       Driver          "nvidia"
+       Option          "NoLogo"        "true"
+EndSection