diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-03-09 10:26:26 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2005-03-09 10:26:26 +0000 |
| commit | 1b27bae6eac796b4834b64cad9aaf9d9477c1053 (patch) | |
| tree | effa109b7258b410940fc4174f5769e99144753e | |
| parent | c6507a7c805cedfd14f4156750faaaa460648a2e (diff) | |
gpe-session-scripts: Only use the xmodmap file for 2.4 kernels on c7x0
BKrev: 422ecf52_q-qVdaDJ88du8r5JviFqA
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | packages/gpe-session-scripts/files/keymap.sh | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0ce6424594..a8469e06ed 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -89,6 +89,7 @@ red@quarm.(none) reenoo@sugarcube.dyndns.org rjt@bob.cambridgebroadband.com rjt@flotta.cambridgebroadband.com +root@darkstar.example.net root@tim.rpsys.net roy@rant-central.com rwhitby@home.(none) diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh index a34e91ffb1..0e64aac9f4 100644 --- a/packages/gpe-session-scripts/files/keymap.sh +++ b/packages/gpe-session-scripts/files/keymap.sh @@ -4,7 +4,11 @@ MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` case $MACHINE in "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - xmodmap - < /etc/X11/shepherd.xmodmap + case `uname -r` in + 2.4*) + xmodmap - < /etc/X11/shepherd.xmodmap + ;; + esac ;; "Sharp-Collie") xmodmap - < /etc/X11/collie.xmodmap |