olpc-kbdshim update for squeeze

[Andres Salomon <dilinger@queued.net>]

Hi,

I just uploaded olpc-kbdshim 12-3.  I'm hoping this can get into
squeeze; it fixes a single grave bug (#606714).  The upstream kernel
patches for /proc/device-tree are due to land any day now, and it would
be a shame if olpc-kbdshim ended up being useless in squeeze.

The changes are below.


--- o/olpc-kbdshim-12/debian/changelog	2010-12-11 20:51:51.000000000 +0000
+++ olpc-kbdshim-12/debian/changelog	2010-12-11 03:28:24.000000000 +0000
@@ -1,3 +1,11 @@
+olpc-kbdshim (12-3) unstable; urgency=high
+
+  * Init script should check /proc/device-tree/model rather than /ofw/model,
+    as that's where the upstream kernel places the device tree.  Last minute
+    fix for squeeze.
+
+ -- Andres Salomon <dilinger@debian.org>  Sat, 11 Dec 2010 03:25:27 +0000
+
 olpc-kbdshim (12-2) unstable; urgency=low
 
   * Fix a buglet w/ kbdshim-hal not starting correctly.
--- o/olpc-kbdshim-12/debian/olpc-kbdshim.init	2010-12-11 20:51:51.000000000 +0000
+++ olpc-kbdshim-12/debian/olpc-kbdshim.init	2010-12-11 03:25:57.000000000 +0000
@@ -20,7 +20,7 @@
 test -x $DAEMON || exit 0
 
 # make sure we're running on an XO
-[ -f /ofw/model ] || exit 0
+[ -f /proc/device-tree/model ] || exit 0
 
 . /lib/lsb/init-functions