Updating comments in xserver-xorg script.
authorDaniel Baumann <daniel@debian.org>
Wed, 5 Dec 2012 16:41:18 +0000 (17:41 +0100)
committerDaniel Baumann <daniel@debian.org>
Wed, 5 Dec 2012 16:41:18 +0000 (17:41 +0100)
scripts/config/1150-xserver-xorg

index 879ab28..f805dad 100755 (executable)
@@ -116,9 +116,9 @@ Configure_xserver_xorg ()
 
                        if [ -z "${LIVE_XORG_DRIVER}" ]
                        then
+                               # xorg-driver automatic override for fglrx
                                if echo "${_DEVICE}" | grep -qs '^1002'
                                then
-                                       # xorg-driver automatic override for fglrx
                                        if grep -qs "${_DEVICE}" /usr/share/fglrx/fglrx.ids
                                        then
                                                LIVE_XORG_DRIVER="fglrx"
@@ -127,9 +127,9 @@ Configure_xserver_xorg ()
                                        fi
                                fi
 
+                               # xorg-driver automatic override for nvidia
                                if echo "${_DEVICE}" | grep -qs -E '^(10DE|12D2)'
                                then
-                                       # xorg-driver automatic override for nvidia
                                        for _NVIDIA_IDS in /usr/lib/nvidia/current/nvidia.ids $(ls /usr/lib/nvidia/legacy-*/nvidia.ids | sort -V -r)
                                        do
                                                if [ -e "${_NVIDIA_IDS}" ]
@@ -162,10 +162,12 @@ Configure_xserver_xorg ()
 
                if [ -e "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" ]
                then
-                       # xorg-driver manual overrides
+                       # xorg-driver manual override
                        cp "/usr/share/live/config/xserver-xorg/${LIVE_XORG_DRIVER}.conf" /etc/X11/xorg.conf.d/99-live.conf
                else
 
+                       # xorg-driver automatic override
+
 cat > /etc/X11/xorg.conf.d/99-live.conf << EOF
 Section "Device"
        Identifier      "Default screen"