summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--packages/gpe-session-scripts/files/keymap.sh6
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