/[baselayout]/trunk/init.d/keymaps
Gentoo

Diff of /trunk/init.d/keymaps

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 377 Revision 378
15 return 1 15 return 1
16 fi 16 fi
17} 17}
18 18
19start() { 19start() {
20 local WINDOWKEYS_KEYMAP=
21
20 checkconfig || return 1 22 checkconfig || return 1
21 23
22 # Force linux keycodes for PPC ... 24 # Force linux keycodes for PPC ...
23 if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ] 25 if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]
24 then 26 then
35 fi 37 fi
36 38
37 # New kbd support ... 39 # New kbd support ...
38 if [ -x /bin/loadkeys ] 40 if [ -x /bin/loadkeys ]
39 then 41 then
40 [ -z "${EXTENDED_KEYMAP}" ] && local EXTENDED_KEYMAP="windowkeys" 42 [ "${SET_WINDOWKEYS}" = "yes" ] && WINDOWKEYS_KEYMAP="windowkeys"
41 43
42 /bin/loadkeys -q ${EXTENDED_KEYMAP} ${KEYMAP} >/dev/null 44 /bin/loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
45 ${EXTENDED_KEYMAPS} >/dev/null
46
43 # Old console-tools support ... 47 # Old console-tools support ...
44 elif [ -x /usr/bin/loadkeys ] 48 elif [ -x /usr/bin/loadkeys ]
45 then 49 then
46 [ -z "${EXTENDED_KEYMAP}" ] && local EXTENDED_KEYMAP="windowkeys.inc" 50 [ "${SET_WINDOWKEYS}" = "yes" ] && WINDOWKEYS_KEYMAP="windowkeys.inc"
47 51
48 /usr/bin/loadkeys -q ${EXTENDED_KEYMAP} ${KEYMAP} >/dev/null 52 /usr/bin/loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
53 ${EXTENDED_KEYMAPS} >/dev/null
49 else 54 else
50 eend 1 "loadkeys executable not found" 55 eend 1 "loadkeys executable not found"
51 return 1 56 return 1
52 fi 57 fi
53 eend $? "Error loading key mappings" 58 eend $? "Error loading key mappings"

Legend:
Removed from v.377  
changed lines
  Added in v.378

  ViewVC Help
Powered by ViewVC 1.1.20