[Micah Anderson]
> hotkey-setup shouldn't assume that an xorg.conf file exists at all, 
> in fact the X strike force people are making it easier and easier every
> day to run X without a config file as X can figure most of this out
> without one (see recent blog post on planet by david nusinow for example).

Good catch.  Does this patch solve the issue?

diff -Nru /tmp/eGMtg7Df1c/hotkey-setup-0.1/debian/init.d 
/tmp/Lgxpw5ijda/hotkey-setup-0.1/debian/init.d
--- /tmp/eGMtg7Df1c/hotkey-setup-0.1/debian/init.d      2008-01-10 
21:00:34.000000000 +0100
+++ /tmp/Lgxpw5ijda/hotkey-setup-0.1/debian/init.d      2008-01-16 
23:08:03.000000000 +0100
@@ -20,8 +20,14 @@
 THINKPAD_PROC_HOTKEY=/proc/acpi/ibm/hotkey
 THINKPAD_KEYS=/usr/sbin/thinkpad-keys

+xorg_driver() {
+    if [ -e /etc/X11/xorg.conf ] ; then
+       sed -n -e '/^[ \t]*section[ \\t]*"device"/I,/^[ \t]*endsection/I{/^[ 
\t]*driver[ \t]*/I{s/^[ \t]*driver[ \t]*"*//I;s/"*[ \t]*$//;p}}' 
/etc/X11/xorg.conf
+    fi
+}
+
 do_video () {
-    VIDEO=`sed -n -e '/^[ \t]*section[ \\t]*"device"/I,/^[ 
\t]*endsection/I{/^[ \t]*driver[ \t]*/I{s/^[ \t]*driver[ \t]*"*//I;s/"*[ 
\t]*$//;p}}' /etc/X11/xorg.conf`
+    VIDEO=`xorg_driver`
     case $VIDEO in
        intel|ati|radeon)
            for x in /proc/acpi/video/*/DOS; do
@@ -39,7 +45,7 @@
     . /usr/share/hotkey-setup/ibm.hk
     modprobe thinkpad-acpi

-    VIDEO=`sed -n -e '/^[ \t]*section[ \\t]*"device"/I,/^[ 
\t]*endsection/I{/^[ \t]*driver[ \t]*/I{s/^[ \t]*driver[ \t]*"*//I;s/"*[ 
\t]*$//;p}}' /etc/X11/xorg.conf`
+    VIDEO=`xorg_driver`
     case $VIDEO in
        intel|ati|radeon)
            echo 0xffffff > $THINKPAD_PROC_HOTKEY

Happy hacking,
-- 
Petter Reinholdtsen



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to