diff --git a/certupdate/all/usr/sbin/certupdate.sh b/certupdate/all/usr/sbin/certupdate.sh deleted file mode 100755 index ba7a5c59..00000000 --- a/certupdate/all/usr/sbin/certupdate.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (C) 2023 AuxXxilium and Ing -# - -# ca-certificates.crt -FILE="/etc/ssl/certs/ca-certificates.crt" -if [ -f "${FILE}" ]; then - STATUS=$(curl -kL -w "%{http_code}" "https://curl.se/ca/cacert.pem" -o "/tmp/cacert.pem") - if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then - echo "ca-certificates.crt download error!" - else - [ ! -f "${FILE}.bak" ] && cp -f "${FILE}" "${FILE}.bak" - cp -f "/tmp/cacert.pem" "${FILE}" - fi -fi - -exit 0 \ No newline at end of file diff --git a/certupdate/install.sh b/certupdate/install.sh deleted file mode 100755 index f69c0865..00000000 --- a/certupdate/install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env ash - -if [ "${1}" = "late" ]; then - echo "Installing daemon for CertUpdate" - cp -vf /usr/sbin/certupdate.sh /tmpRoot/usr/sbin/certupdate.sh - [ -f "/tmpRoot/lib/systemd/system/certupdate.service" ] && rm -f "/tmpRoot/lib/systemd/system/certupdate.service" - DEST="/tmpRoot/lib/systemd/system/certupdate.service" - echo "[Unit]" >${DEST} - echo "Description=Update Cert" >>${DEST} - echo "After=multi-user.target" >>${DEST} - echo >>${DEST} - echo "[Service]" >>${DEST} - echo "Type=oneshot" >>${DEST} - echo "RemainAfterExit=true" >>${DEST} - echo "ExecStart=/usr/sbin/certupdate.sh" >>${DEST} - echo >>${DEST} - echo "[Install]" >>${DEST} - echo "WantedBy=multi-user.target" >>${DEST} - - mkdir -vp /tmpRoot/lib/systemd/system/multi-user.target.wants - ln -vsf /lib/systemd/system/certupdate.service /tmpRoot/lib/systemd/system/multi-user.target.wants/certupdate.service -fi diff --git a/console/all/usr/bin/gzip b/console/all/usr/bin/gzip new file mode 100755 index 00000000..736fc021 Binary files /dev/null and b/console/all/usr/bin/gzip differ diff --git a/console/all/usr/bin/ioctl b/console/all/usr/bin/ioctl new file mode 100755 index 00000000..86e15671 Binary files /dev/null and b/console/all/usr/bin/ioctl differ diff --git a/console/all/usr/bin/loadkeys b/console/all/usr/bin/loadkeys new file mode 100755 index 00000000..cb54246e Binary files /dev/null and b/console/all/usr/bin/loadkeys differ diff --git a/console/all/usr/bin/sed b/console/all/usr/bin/sed new file mode 100755 index 00000000..29526f79 Binary files /dev/null and b/console/all/usr/bin/sed differ diff --git a/console/all/usr/bin/setleds b/console/all/usr/bin/setleds new file mode 100755 index 00000000..d3519696 Binary files /dev/null and b/console/all/usr/bin/setleds differ diff --git a/console/all/usr/share/keymaps/i386/azerty/azerty.map.gz b/console/all/usr/share/keymaps/i386/azerty/azerty.map.gz new file mode 100755 index 00000000..4c06fbcb Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/azerty.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/be-latin1.map.gz b/console/all/usr/share/keymaps/i386/azerty/be-latin1.map.gz new file mode 100755 index 00000000..9c3b38ed Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/be-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/fr-latin1.map.gz b/console/all/usr/share/keymaps/i386/azerty/fr-latin1.map.gz new file mode 100755 index 00000000..c35ef1bb Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/fr-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/fr-latin9.map.gz b/console/all/usr/share/keymaps/i386/azerty/fr-latin9.map.gz new file mode 100755 index 00000000..217bc836 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/fr-latin9.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/fr-pc.map.gz b/console/all/usr/share/keymaps/i386/azerty/fr-pc.map.gz new file mode 100755 index 00000000..2977853f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/fr-pc.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/fr.map.gz b/console/all/usr/share/keymaps/i386/azerty/fr.map.gz new file mode 100755 index 00000000..0eb577af Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/fr.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/wangbe.map.gz b/console/all/usr/share/keymaps/i386/azerty/wangbe.map.gz new file mode 100755 index 00000000..e7e949e7 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/wangbe.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/azerty/wangbe2.map.gz b/console/all/usr/share/keymaps/i386/azerty/wangbe2.map.gz new file mode 100755 index 00000000..3cf05f5d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/azerty/wangbe2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/bepo/fr-bepo-latin9.map.gz b/console/all/usr/share/keymaps/i386/bepo/fr-bepo-latin9.map.gz new file mode 100755 index 00000000..e7db5c4c Binary files /dev/null and b/console/all/usr/share/keymaps/i386/bepo/fr-bepo-latin9.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/bepo/fr-bepo.map.gz b/console/all/usr/share/keymaps/i386/bepo/fr-bepo.map.gz new file mode 100755 index 00000000..8bb5abe2 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/bepo/fr-bepo.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/carpalx/carpalx-full.map.gz b/console/all/usr/share/keymaps/i386/carpalx/carpalx-full.map.gz new file mode 100755 index 00000000..585c228a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/carpalx/carpalx-full.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/carpalx/carpalx.map.gz b/console/all/usr/share/keymaps/i386/carpalx/carpalx.map.gz new file mode 100755 index 00000000..86f469df Binary files /dev/null and b/console/all/usr/share/keymaps/i386/carpalx/carpalx.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/colemak/en-latin9.map.gz b/console/all/usr/share/keymaps/i386/colemak/en-latin9.map.gz new file mode 100755 index 00000000..70e550a2 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/colemak/en-latin9.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/ANSI-dvorak.map.gz b/console/all/usr/share/keymaps/i386/dvorak/ANSI-dvorak.map.gz new file mode 100755 index 00000000..f8a63378 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/ANSI-dvorak.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-ca-fr.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-ca-fr.map.gz new file mode 100755 index 00000000..c8cb01ec Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-ca-fr.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-es.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-es.map.gz new file mode 100755 index 00000000..637023df Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-es.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-fr.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-fr.map.gz new file mode 100755 index 00000000..44b524fe Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-fr.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-l.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-l.map.gz new file mode 100755 index 00000000..faf49dcb Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-l.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-la.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-la.map.gz new file mode 100755 index 00000000..a3c6df4e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-la.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-no.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-no.map.gz new file mode 100755 index 00000000..a508a935 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-no.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-programmer.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-programmer.map.gz new file mode 100755 index 00000000..673bcb33 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-programmer.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-r.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-r.map.gz new file mode 100755 index 00000000..d05b7310 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-r.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-ru.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-ru.map.gz new file mode 100755 index 00000000..a3005869 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-ru.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-sv-a1.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-sv-a1.map.gz new file mode 100755 index 00000000..1520442c Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-sv-a1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-sv-a5.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-sv-a5.map.gz new file mode 100755 index 00000000..337fa8f9 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-sv-a5.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-uk.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-uk.map.gz new file mode 100755 index 00000000..cdf45b30 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-uk.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak-ukp.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak-ukp.map.gz new file mode 100755 index 00000000..d9dc8778 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak-ukp.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/dvorak/dvorak.map.gz b/console/all/usr/share/keymaps/i386/dvorak/dvorak.map.gz new file mode 100755 index 00000000..658f7b60 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/dvorak/dvorak.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/fgGIod/tr_f-latin5.map.gz b/console/all/usr/share/keymaps/i386/fgGIod/tr_f-latin5.map.gz new file mode 100755 index 00000000..2c8b9359 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/fgGIod/tr_f-latin5.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/fgGIod/trf.map.gz b/console/all/usr/share/keymaps/i386/fgGIod/trf.map.gz new file mode 100755 index 00000000..8c221071 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/fgGIod/trf.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/applkey.map.gz b/console/all/usr/share/keymaps/i386/include/applkey.map.gz new file mode 100755 index 00000000..97ca96a0 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/applkey.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/azerty-layout.inc b/console/all/usr/share/keymaps/i386/include/azerty-layout.inc new file mode 100755 index 00000000..8103f5e6 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/azerty-layout.inc @@ -0,0 +1,30 @@ +# azerty-layout +keycode 16 = a +keycode 17 = z +keycode 18 = e +keycode 19 = r +keycode 20 = t +keycode 21 = y +keycode 22 = u +keycode 23 = i +keycode 24 = o +keycode 25 = p +# +keycode 30 = q +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h +keycode 36 = j +keycode 37 = k +keycode 38 = l +keycode 39 = m +# +keycode 44 = w +keycode 45 = x +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n +# diff --git a/console/all/usr/share/keymaps/i386/include/backspace.map.gz b/console/all/usr/share/keymaps/i386/include/backspace.map.gz new file mode 100755 index 00000000..90cbebca Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/backspace.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/compose.inc b/console/all/usr/share/keymaps/i386/include/compose.inc new file mode 100755 index 00000000..c86d2dab --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/compose.inc @@ -0,0 +1,8 @@ +# We map the PrintScreen key (useless) and Alt+AltGr to the Compose key... +# A really useful thing not found on normal keyboards. :/ +# +# (c) 2001 Bernhard Rosenkrnzer + +keycode 99 = Compose # SysRq/PrintScrn +keycode 100 = AltGr +alt keycode 100 = Compose diff --git a/console/all/usr/share/keymaps/i386/include/ctrl.map.gz b/console/all/usr/share/keymaps/i386/include/ctrl.map.gz new file mode 100755 index 00000000..3bdc9105 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/ctrl.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/euro.map.gz b/console/all/usr/share/keymaps/i386/include/euro.map.gz new file mode 100755 index 00000000..1cb40df6 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/euro.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/euro1.inc b/console/all/usr/share/keymaps/i386/include/euro1.inc new file mode 100755 index 00000000..0e5be38c --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/euro1.inc @@ -0,0 +1,6 @@ +# Euro and cent +# [Say: "loadkeys euro1" to get Euro and cent with AltGr (right alt) +# on the positions where many keyboards have 5 and C. +# To get it displayed, use a latin0 (i.e., latin9) font.] +altgr keycode 6 = currency +altgr keycode 46 = cent diff --git a/console/all/usr/share/keymaps/i386/include/euro1.map.gz b/console/all/usr/share/keymaps/i386/include/euro1.map.gz new file mode 100755 index 00000000..2751d500 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/euro1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/euro2.map.gz b/console/all/usr/share/keymaps/i386/include/euro2.map.gz new file mode 100755 index 00000000..fe24c45f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/euro2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/keypad.map.gz b/console/all/usr/share/keymaps/i386/include/keypad.map.gz new file mode 100755 index 00000000..a5af5336 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/keypad.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/linux-keys-bare.inc b/console/all/usr/share/keymaps/i386/include/linux-keys-bare.inc new file mode 100755 index 00000000..64a4ee95 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/linux-keys-bare.inc @@ -0,0 +1,163 @@ +# Linux-specific (and language-independent) keys +# +# This file describes function keys, console switching keys, +# keypad, cursor keys, and SysRq, ScrollLock, Pause +# +# It does not use the AltGr modifier, so that the user can opt +# to have both Alt keys produce the same effect. +# As a consequence, the Hex_* keys are missing, as are +# control altgr keycode 83 = Boot +# control altgr keycode 111 = Boot +# +# One culture-specific item that will be overridden in many keymaps +# is the KP_Period: many countries have a KP_Comma instead. +# +# One user-preference item will be the function of the Delete key. +# +# Old keyboards have 10 function keys, and keymaps have +# sometimes used shift+F1 = F11, and sometimes shift+F1 = F13. +# Here we assume an enhanced keyboard (with 12 function keys). +# +plain keycode 59 = F1 +plain keycode 60 = F2 +plain keycode 61 = F3 +plain keycode 62 = F4 +plain keycode 63 = F5 +plain keycode 64 = F6 +plain keycode 65 = F7 +plain keycode 66 = F8 +plain keycode 67 = F9 +plain keycode 68 = F10 +plain keycode 87 = F11 +plain keycode 88 = F12 +shift keycode 59 = F13 +shift keycode 60 = F14 +shift keycode 61 = F15 +shift keycode 62 = F16 +shift keycode 63 = F17 +shift keycode 64 = F18 +shift keycode 65 = F19 +shift keycode 66 = F20 +shift keycode 67 = F21 +shift keycode 68 = F22 +shift keycode 87 = F23 +shift keycode 88 = F24 +control keycode 59 = F25 +control keycode 60 = F26 +control keycode 61 = F27 +control keycode 62 = F28 +control keycode 63 = F29 +control keycode 64 = F30 +control keycode 65 = F31 +control keycode 66 = F32 +control keycode 67 = F33 +control keycode 68 = F34 +control keycode 87 = F35 +control keycode 88 = F36 +# +# The canonical assignment for F37-F48 uses +# control shift keycode 59 = F37 +# etc. If you want that, load linux-keys-extd.inc +# +# Both Alt+Fn and Control+Alt+Fn switch to Console n +# (in order to please Linux / dosemu / X). +# Here Consoles 1..12. For 13..24 load linux-keys-extd.inc +# +alt keycode 59 = Console_1 +alt keycode 60 = Console_2 +alt keycode 61 = Console_3 +alt keycode 62 = Console_4 +alt keycode 63 = Console_5 +alt keycode 64 = Console_6 +alt keycode 65 = Console_7 +alt keycode 66 = Console_8 +alt keycode 67 = Console_9 +alt keycode 68 = Console_10 +alt keycode 87 = Console_11 +alt keycode 88 = Console_12 +control alt keycode 59 = Console_1 +control alt keycode 60 = Console_2 +control alt keycode 61 = Console_3 +control alt keycode 62 = Console_4 +control alt keycode 63 = Console_5 +control alt keycode 64 = Console_6 +control alt keycode 65 = Console_7 +control alt keycode 66 = Console_8 +control alt keycode 67 = Console_9 +control alt keycode 68 = Console_10 +control alt keycode 87 = Console_11 +control alt keycode 88 = Console_12 + +# +# Keypad keys +# +keycode 69 = Num_Lock +keycode 98 = KP_Divide +keycode 55 = KP_Multiply +keycode 74 = KP_Subtract +keycode 78 = KP_Add +keycode 96 = KP_Enter +# +keycode 71 = KP_7 +keycode 72 = KP_8 +keycode 73 = KP_9 +keycode 75 = KP_4 +keycode 76 = KP_5 +keycode 77 = KP_6 +keycode 79 = KP_1 +keycode 80 = KP_2 +keycode 81 = KP_3 +keycode 82 = KP_0 +# +keycode 83 = KP_Period # or KP_Comma +control alt keycode 83 = Boot +# +alt keycode 71 = Ascii_7 +alt keycode 72 = Ascii_8 +alt keycode 73 = Ascii_9 +alt keycode 75 = Ascii_4 +alt keycode 76 = Ascii_5 +alt keycode 77 = Ascii_6 +alt keycode 79 = Ascii_1 +alt keycode 80 = Ascii_2 +alt keycode 81 = Ascii_3 +alt keycode 82 = Ascii_0 +# +# The four cursor keys +# +keycode 103 = Up +keycode 105 = Left +keycode 106 = Right +keycode 108 = Down +alt keycode 103 = KeyboardSignal +alt keycode 105 = Decr_Console +alt keycode 106 = Incr_Console +# +# The six edit keys +# +keycode 110 = Insert +keycode 102 = Home # Find +keycode 104 = PageUp # Prior +keycode 111 = Remove +keycode 107 = End # Select +keycode 109 = PageDown # Next +shift keycode 104 = Scroll_Backward +shift keycode 109 = Scroll_Forward +control alt keycode 111 = Boot +# +# The three system keys +# +keycode 84 = Last_Console # Alt+SysRq/PrintScrn +#keycode 99 = VoidSymbol # SysRq/PrintScrn +keycode 99 = Compose # SysRq/PrintScrn +alt keycode 99 = Control_backslash +control keycode 99 = Control_backslash + +plain keycode 70 = Scroll_Lock +shift keycode 70 = Show_Memory +control keycode 70 = Show_State +alt keycode 70 = Show_Registers + +keycode 101 = Break # Ctrl+Break/Pause +keycode 119 = Pause # Break/Pause + diff --git a/console/all/usr/share/keymaps/i386/include/linux-keys-extd.inc b/console/all/usr/share/keymaps/i386/include/linux-keys-extd.inc new file mode 100755 index 00000000..401a4563 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/linux-keys-extd.inc @@ -0,0 +1,37 @@ +# +# More function keys and console assignments +# These are not in the main map in order to save keymaps +# Load after the main keymap, or include in the main keymap. +# +keymaps 5,9 + +control shift keycode 59 = F37 +control shift keycode 60 = F38 +control shift keycode 61 = F39 +control shift keycode 62 = F40 +control shift keycode 63 = F41 +control shift keycode 64 = F42 +control shift keycode 65 = F43 +control shift keycode 66 = F44 +control shift keycode 67 = F45 +control shift keycode 68 = F46 +control shift keycode 87 = F47 +control shift keycode 88 = F48 +# +alt shift keycode 59 = Console_13 +alt shift keycode 60 = Console_14 +alt shift keycode 61 = Console_15 +alt shift keycode 62 = Console_16 +alt shift keycode 63 = Console_17 +alt shift keycode 64 = Console_18 +alt shift keycode 65 = Console_19 +alt shift keycode 66 = Console_20 +alt shift keycode 67 = Console_21 +alt shift keycode 68 = Console_22 +alt shift keycode 87 = Console_23 +alt shift keycode 88 = Console_24 +# +# It would be reasonable to add lines like +# control alt shift keycode 59 = Console_13 +# but that would again require an extra key map, and is not worth it. +# diff --git a/console/all/usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc b/console/all/usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc new file mode 100755 index 00000000..71a959e7 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/linux-with-alt-and-altgr.inc @@ -0,0 +1,29 @@ +include "linux-keys-bare" + +keycode 100 = AltGr +alt keycode 100 = Compose + +altgr keycode 70 = Show_Registers +alt keycode 70 = Scroll_Lock + +control altgr keycode 83 = Boot +control altgr keycode 111 = Boot + +# Hex keypad keys (for giving a Unicode value in 4 hex digits) +# Follow lt.map and assign Hex_A .. Hex_F to keypad border. +altgr keycode 55 = Hex_C +altgr keycode 69 = Hex_A +altgr keycode 71 = Hex_7 +altgr keycode 72 = Hex_8 +altgr keycode 73 = Hex_9 +altgr keycode 74 = Hex_D +altgr keycode 75 = Hex_4 +altgr keycode 76 = Hex_5 +altgr keycode 77 = Hex_6 +altgr keycode 78 = Hex_E +altgr keycode 79 = Hex_1 +altgr keycode 80 = Hex_2 +altgr keycode 81 = Hex_3 +altgr keycode 82 = Hex_0 +altgr keycode 96 = Hex_F +altgr keycode 98 = Hex_B diff --git a/console/all/usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc b/console/all/usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc new file mode 100755 index 00000000..29012baa --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/linux-with-modeshift-altgr.inc @@ -0,0 +1,101 @@ +# For keymaps in which AltGr_Lock is used to switch between two alphabets. +# +# A common construction is +# alt keycode 42 = AltGr_Lock +# altgr alt keycode 42 = AltGr_Lock +# +# All Linux keys have the same meaning with or without AltGr. +# No convention for Hex_* has been established. + +include "linux-keys-bare" + +keycode 100 = AltGr + +altgr keycode 59 = F1 +altgr keycode 60 = F2 +altgr keycode 61 = F3 +altgr keycode 62 = F4 +altgr keycode 63 = F5 +altgr keycode 64 = F6 +altgr keycode 65 = F7 +altgr keycode 66 = F8 +altgr keycode 67 = F9 +altgr keycode 68 = F10 +altgr keycode 87 = F11 +altgr keycode 88 = F12 +altgr shift keycode 59 = F13 +altgr shift keycode 60 = F14 +altgr shift keycode 61 = F15 +altgr shift keycode 62 = F16 +altgr shift keycode 63 = F17 +altgr shift keycode 64 = F18 +altgr shift keycode 65 = F19 +altgr shift keycode 66 = F20 +altgr shift keycode 67 = F21 +altgr shift keycode 68 = F22 +altgr shift keycode 87 = F23 +altgr shift keycode 88 = F24 +altgr control keycode 59 = F25 +altgr control keycode 60 = F26 +altgr control keycode 61 = F27 +altgr control keycode 62 = F28 +altgr control keycode 63 = F29 +altgr control keycode 64 = F30 +altgr control keycode 65 = F31 +altgr control keycode 66 = F32 +altgr control keycode 67 = F33 +altgr control keycode 68 = F34 +altgr control keycode 87 = F35 +altgr control keycode 88 = F36 +# +altgr alt keycode 59 = Console_1 +altgr alt keycode 60 = Console_2 +altgr alt keycode 61 = Console_3 +altgr alt keycode 62 = Console_4 +altgr alt keycode 63 = Console_5 +altgr alt keycode 64 = Console_6 +altgr alt keycode 65 = Console_7 +altgr alt keycode 66 = Console_8 +altgr alt keycode 67 = Console_9 +altgr alt keycode 68 = Console_10 +altgr alt keycode 87 = Console_11 +altgr alt keycode 88 = Console_12 +altgr control alt keycode 59 = Console_1 +altgr control alt keycode 60 = Console_2 +altgr control alt keycode 61 = Console_3 +altgr control alt keycode 62 = Console_4 +altgr control alt keycode 63 = Console_5 +altgr control alt keycode 64 = Console_6 +altgr control alt keycode 65 = Console_7 +altgr control alt keycode 66 = Console_8 +altgr control alt keycode 67 = Console_9 +altgr control alt keycode 68 = Console_10 +altgr control alt keycode 87 = Console_11 +altgr control alt keycode 88 = Console_12 +# +altgr alt keycode 71 = Ascii_7 +altgr alt keycode 72 = Ascii_8 +altgr alt keycode 73 = Ascii_9 +altgr alt keycode 75 = Ascii_4 +altgr alt keycode 76 = Ascii_5 +altgr alt keycode 77 = Ascii_6 +altgr alt keycode 79 = Ascii_1 +altgr alt keycode 80 = Ascii_2 +altgr alt keycode 81 = Ascii_3 +altgr alt keycode 82 = Ascii_0 +# +altgr alt keycode 103 = KeyboardSignal +altgr alt keycode 105 = Decr_Console +altgr alt keycode 106 = Incr_Console +# +altgr shift keycode 104 = Scroll_Backward +altgr shift keycode 109 = Scroll_Forward +# +# altgr control keycode 83 = Boot +altgr control alt keycode 83 = Boot +# altgr control keycode 111 = Boot +altgr control alt keycode 111 = Boot +# +# an exception - altgr changes the function +# +altgr keycode 70 = Show_Registers diff --git a/console/all/usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc b/console/all/usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc new file mode 100755 index 00000000..223bea6e --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/linux-with-two-alt-keys.inc @@ -0,0 +1,6 @@ +# For keymaps in which both Alt keys are equivalent +# No convention for Hex_* has been established. + +include "linux-keys-bare" + +keycode 100 = Alt diff --git a/console/all/usr/share/keymaps/i386/include/qwerty-layout.inc b/console/all/usr/share/keymaps/i386/include/qwerty-layout.inc new file mode 100755 index 00000000..070b0246 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/qwerty-layout.inc @@ -0,0 +1,31 @@ +# qwerty-layout +keycode 16 = q +keycode 17 = w +keycode 18 = e +keycode 19 = r +keycode 20 = t +keycode 21 = y +keycode 22 = u +keycode 23 = i +keycode 24 = o +keycode 25 = p +# +keycode 30 = a +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h +keycode 36 = j +keycode 37 = k +keycode 38 = l +# +keycode 44 = z +keycode 45 = x +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n +keycode 50 = m +# +include "compose" diff --git a/console/all/usr/share/keymaps/i386/include/qwertz-layout.inc b/console/all/usr/share/keymaps/i386/include/qwertz-layout.inc new file mode 100755 index 00000000..07535dc7 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/include/qwertz-layout.inc @@ -0,0 +1,31 @@ +# qwertz-layout +keycode 16 = q +keycode 17 = w +keycode 18 = e +keycode 19 = r +keycode 20 = t +keycode 21 = z +keycode 22 = u +keycode 23 = i +keycode 24 = o +keycode 25 = p +# +keycode 30 = a +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h +keycode 36 = j +keycode 37 = k +keycode 38 = l +# +keycode 44 = y +keycode 45 = x +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n +keycode 50 = m +# +include "compose" diff --git a/console/all/usr/share/keymaps/i386/include/unicode.map.gz b/console/all/usr/share/keymaps/i386/include/unicode.map.gz new file mode 100755 index 00000000..c832d7f5 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/unicode.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/include/windowkeys.map.gz b/console/all/usr/share/keymaps/i386/include/windowkeys.map.gz new file mode 100755 index 00000000..bd3a2cbc Binary files /dev/null and b/console/all/usr/share/keymaps/i386/include/windowkeys.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/neo/README.md b/console/all/usr/share/keymaps/i386/neo/README.md new file mode 100755 index 00000000..693a654d --- /dev/null +++ b/console/all/usr/share/keymaps/i386/neo/README.md @@ -0,0 +1,31 @@ +Neo 2 +===== + +This directory includes various variants of Neo 2 (Often only referred to as Neo) - an Ergonomic Keyboard Layout, optimized for the German Language. +They have the following in common: + +- Optimizations regarding Letter Frequency as well as Bi– and Trigrams given by the German Language (on Layer 1 and 2) +- Directly underneath your finger tips lie frequently used chars for Programming Languages (on Layer 3) +- Navigation Keys and numbers also lie directly under your finger tips! (on Layer 4) +- New chars can be entered, like: „ , ” , « , » , ∫ , √ , α , β , … (and massively more) + +Links +===== + +German website: https://neo-layout.org/ + + +Notes: +===== +• Not using KP_-keysyms on fourth level as NumLock is not controllable + (i.e. can't be forced to on whenever the keymaps are loaded). + On console there is little need for KP_-keysyms. +• Mod4-Lock is not implemented (technical difficulties, not enough levels) +• Dead keys only when there exists a corresponding dead keysym on console + (i.e circumflex, gravis, cedille, trema, akut and tilde) otherwise the + undead character is produced. +• Using default compose as for now. Maximum number allowed compose + sequences seems to be 256, not enough for the standard Neo2 sequences. +• Wrong Caps_Lock behaviour with ssharp (not returning to lower case when + using Caps_Lock and Shift) + See: https://bugzilla.kernel.org/show_bug.cgi?id=7063 diff --git a/console/all/usr/share/keymaps/i386/neo/adnw.map.gz b/console/all/usr/share/keymaps/i386/neo/adnw.map.gz new file mode 100755 index 00000000..3da252c6 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/neo/adnw.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/neo/bone.map.gz b/console/all/usr/share/keymaps/i386/neo/bone.map.gz new file mode 100755 index 00000000..4348f208 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/neo/bone.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/neo/koy.map.gz b/console/all/usr/share/keymaps/i386/neo/koy.map.gz new file mode 100755 index 00000000..d1bd64b6 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/neo/koy.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/neo/neo.map.gz b/console/all/usr/share/keymaps/i386/neo/neo.map.gz new file mode 100755 index 00000000..49d7a907 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/neo/neo.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/neo/neoqwertz.map.gz b/console/all/usr/share/keymaps/i386/neo/neoqwertz.map.gz new file mode 100755 index 00000000..0734ffec Binary files /dev/null and b/console/all/usr/share/keymaps/i386/neo/neoqwertz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/olpc/es.map.gz b/console/all/usr/share/keymaps/i386/olpc/es.map.gz new file mode 100755 index 00000000..814112b7 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/olpc/es.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/olpc/pt.map.gz b/console/all/usr/share/keymaps/i386/olpc/pt.map.gz new file mode 100755 index 00000000..f8392f2b Binary files /dev/null and b/console/all/usr/share/keymaps/i386/olpc/pt.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bashkir.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bashkir.map.gz new file mode 100755 index 00000000..7ec834e9 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bashkir.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bg-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bg-cp1251.map.gz new file mode 100755 index 00000000..fcedd7d7 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bg-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bg-cp855.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bg-cp855.map.gz new file mode 100755 index 00000000..e58ab0b8 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bg-cp855.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bg_bds-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bg_bds-cp1251.map.gz new file mode 100755 index 00000000..582f79c9 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bg_bds-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bg_bds-utf8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bg_bds-utf8.map.gz new file mode 100755 index 00000000..61bb7709 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bg_bds-utf8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bg_pho-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bg_pho-cp1251.map.gz new file mode 100755 index 00000000..b406729a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bg_pho-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bg_pho-utf8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bg_pho-utf8.map.gz new file mode 100755 index 00000000..67053ca2 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bg_pho-utf8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/br-abnt.map.gz b/console/all/usr/share/keymaps/i386/qwerty/br-abnt.map.gz new file mode 100755 index 00000000..742c9e6a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/br-abnt.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/br-abnt2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/br-abnt2.map.gz new file mode 100755 index 00000000..1fe76df5 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/br-abnt2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/br-latin1-abnt2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/br-latin1-abnt2.map.gz new file mode 100755 index 00000000..6d0fc48f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/br-latin1-abnt2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/br-latin1-us.map.gz b/console/all/usr/share/keymaps/i386/qwerty/br-latin1-us.map.gz new file mode 100755 index 00000000..55a2380f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/br-latin1-us.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/by-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/by-cp1251.map.gz new file mode 100755 index 00000000..5b2efdb8 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/by-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/by.map.gz b/console/all/usr/share/keymaps/i386/qwerty/by.map.gz new file mode 100755 index 00000000..ee8d34b4 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/by.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/bywin-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/bywin-cp1251.map.gz new file mode 100755 index 00000000..9d903345 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/bywin-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ca.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ca.map.gz new file mode 100755 index 00000000..a551d3a4 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ca.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/cf.map.gz b/console/all/usr/share/keymaps/i386/qwerty/cf.map.gz new file mode 100755 index 00000000..713e4f0f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/cf.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/cz-cp1250.map.gz b/console/all/usr/share/keymaps/i386/qwerty/cz-cp1250.map.gz new file mode 100755 index 00000000..acdfd76b Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/cz-cp1250.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/cz-lat2-prog.map.gz b/console/all/usr/share/keymaps/i386/qwerty/cz-lat2-prog.map.gz new file mode 100755 index 00000000..60180bd5 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/cz-lat2-prog.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/cz-lat2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/cz-lat2.map.gz new file mode 100755 index 00000000..9658add9 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/cz-lat2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/cz.map.gz b/console/all/usr/share/keymaps/i386/qwerty/cz.map.gz new file mode 100755 index 00000000..e9d3f397 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/cz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/defkeymap.map.gz b/console/all/usr/share/keymaps/i386/qwerty/defkeymap.map.gz new file mode 100755 index 00000000..5b0c4aa9 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/defkeymap.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/defkeymap_V1.0.map.gz b/console/all/usr/share/keymaps/i386/qwerty/defkeymap_V1.0.map.gz new file mode 100755 index 00000000..456bf60e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/defkeymap_V1.0.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/dk-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/dk-latin1.map.gz new file mode 100755 index 00000000..1ca34733 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/dk-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/dk.map.gz b/console/all/usr/share/keymaps/i386/qwerty/dk.map.gz new file mode 100755 index 00000000..f3a733e7 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/dk.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/emacs.map.gz b/console/all/usr/share/keymaps/i386/qwerty/emacs.map.gz new file mode 100755 index 00000000..afed846e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/emacs.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/emacs2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/emacs2.map.gz new file mode 100755 index 00000000..379113ff Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/emacs2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/es-cp850.map.gz b/console/all/usr/share/keymaps/i386/qwerty/es-cp850.map.gz new file mode 100755 index 00000000..e9241347 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/es-cp850.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/es.map.gz b/console/all/usr/share/keymaps/i386/qwerty/es.map.gz new file mode 100755 index 00000000..d9afc788 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/es.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/et-nodeadkeys.map.gz b/console/all/usr/share/keymaps/i386/qwerty/et-nodeadkeys.map.gz new file mode 100755 index 00000000..8068d8eb Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/et-nodeadkeys.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/et.map.gz b/console/all/usr/share/keymaps/i386/qwerty/et.map.gz new file mode 100755 index 00000000..cb62028e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/et.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/fa.map.gz b/console/all/usr/share/keymaps/i386/qwerty/fa.map.gz new file mode 100755 index 00000000..760bc5b2 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/fa.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/fi.map.gz b/console/all/usr/share/keymaps/i386/qwerty/fi.map.gz new file mode 100755 index 00000000..994c89c3 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/fi.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/gr-pc.map.gz b/console/all/usr/share/keymaps/i386/qwerty/gr-pc.map.gz new file mode 100755 index 00000000..a100326f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/gr-pc.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/gr.map.gz b/console/all/usr/share/keymaps/i386/qwerty/gr.map.gz new file mode 100755 index 00000000..ddc6050c Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/gr.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/hu101.map.gz b/console/all/usr/share/keymaps/i386/qwerty/hu101.map.gz new file mode 100755 index 00000000..e1582a64 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/hu101.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/hypermap.m4 b/console/all/usr/share/keymaps/i386/qwerty/hypermap.m4 new file mode 100755 index 00000000..2005fad6 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/qwerty/hypermap.m4 @@ -0,0 +1,475 @@ +# +# hypermap.map 1994/11/11 +# Michael Shields +# +# A keymap redesigned for sanity. +# + +# +# This keymap is a ground-up reimplementation of the keyboard map, +# intended to be consistent and rational. It uses an m4 metalanguage to +# declare the key mappings. Usage is `m4 hypermap.map | loadkeys'. +# +# The modifier flags used are `shift' (1), `control' (4), and `alt' (8). +# Left and right modifiers are not distinguished. +# +# In general, Meta is always distinguished, and M-S-KEY is distinct from +# M-KEY. This is good news for Emacs users. C-S-KEY is consistently +# folded into C-KEY. +# +# Shift is more loosely interpreted than the other modifiers; usually if +# S-KEY has no special meaning, the action will be the same as KEY. +# However, if M-KEY or H-KEY is undefined, nothing happens. +# +# Because Caps Lock's position is so out of proportion to its utility, +# it's been totally redefined to a new sort of modifier, which I've +# arbitrarily named `Hyper'. Shift is ignored with Hyper. Hyper +# provides dead keys: +# H-` dead accent grave +# H-' dead acute accent +# H-^ dead circumflex +# H-t dead tilde +# H-d dead diaeresis +# and ISO-8859-1 symbols (some more mnemonic than others): +# H-SPC nobreakspace +# H-! inverted bang +# H-h cents (`hundredths') +# H-# pounds sterling +# H-$ currency +# H-y yen +# H-| broken bar +# H-s section (the galaxy symbol) +# H-c copyright +# H-a feminine ordinal +# H-< left guillemot +# H-] not sign (it's angular) +# H-- soft hyphen +# H-r registered trademark symbol +# H-= macron +# H-0 degrees +# H-[ plus/minus (near + and -) +# H-k superior 2 (jkl form a series) +# H-l superior 3 +# H-u mu +# H-p pilcrow +# H-: centered dot +# H-j superior 1 +# H-o masculine ordinal +# H-> right guillemot +# H-q 1/4 fraction (qwe form a series) +# H-w 1/2 fraction +# H-e 3/4 fraction +# H-? inverted question mark +# H-x multiplication symbol +# H-% division symbol +# You can also use Hyper plus Alt to type characters by decimal code on +# the keypad, as with Alt alone, or in hex on the main keyboard. And +# H-TAB is a Caps Lock. +# +# Function keys work as marked, unless with Alt, in which case they +# switch to the console with the same number. Shift adds 12 and Hyper +# adds 24 to the numbers (i.e., they logically switch to other banks). +# Thus you can easily address up to 48. Control is ignored, for +# consistency with X. +# +# Finally, you can change the behavior of the Caps Lock and Controls +# with m4 command-line options. The default values are equivalent to +# `-DCAPSLOCK_K=Hyper -DLEFTCTRL_K=Control -DRIGHTCTRL_K=Control'. You +# can remove the Hyper code entirely with `-DCAPSLOCK_K=Caps_Lock'. +# +# This file is arranged vaguely by key position on the classic PC layout. +# + + +dnl Set default values. +ifdef(`CAPSLOCK_K', , `define(`CAPSLOCK_K', `Hyper')') +ifdef(`LEFTCTRL_K', , `define(`LEFTCTRL_K', `Control')') +ifdef(`RIGHTCTRL_K', , `define(`RIGHTCTRL_K', `Control')') + +dnl Figure out if any key is a Hyper key. If so, define `hyper', both +dnl for usefulness and `ifdef' testability. +ifelse(CAPSLOCK_K, `Hyper', `define(`hyper', `ctrlr')', + LEFTCTRL_K, `Hyper', `define(`hyper', `ctrlr')', + RIGHTCTRL_K, `Hyper', `define(`hyper', `ctrlr')') + +define(`Hyper', `CtrlR') + + +keymaps 0,1,4,5,8,9,12,13`'ifdef(`hyper', `,128,129,132,133,136,137,140,141') + + +dnl General usage of these macros is MACRO(KEYCODE, UNSHIFTED, SHIFTED). + +dnl We first undefine `shift', which only causes problems. +undefine(`shift') + +define(`SIMPLE', `keycode $1 = $2 $2') + +define(`KEY', +` keycode $1 = $2 VoidSymbol +shift keycode $1 = $3 + alt keycode $1 = Meta_$2 +shift alt keycode $1 = Meta_$3') + +dnl This macro adds Control variations to a key. +define(`CONTROL', +` control keycode $1 = $2 +shift control keycode $1 = $2 + control alt keycode $1 = Meta_$2 +shift control alt keycode $1 = Meta_$2') + +dnl Add Hyper variations to a key. +define(`HYPER', ifdef(`hyper', +` hyper keycode $1 = $2 +shift hyper keycode $1 = $2')) +define(`CONTROLHYPER', ifdef(`hyper', +` control hyper keycode $1 = $2 +shift control hyper keycode $1 = $2')) +define(`METAHYPER', ifdef(`hyper', +` alt hyper keycode $1 = $2 +shift alt hyper keycode $1 = $2')) +define(`CONTROLMETAHYPER', ifdef(`hyper', dnl Ludicrous. +` control alt hyper keycode $1 = $2 +shift control alt hyper keycode $1 = $2')) + +dnl Special case for letters. Best to be explicit. +define(`LETTER', +` keycode $1 = `+'$2 VoidSymbol +shift keycode $1 = `+'translit($2, `a-z', `A-Z') + alt keycode $1 = `Meta_'$2 +shift alt keycode $1 = `Meta_'translit($2, `a-z', `A-Z') +CONTROL($1, Control_$2)') + +dnl For function keys. Call here is FUNCTION(KEYCODE, FKEYNUM). +define(`BANKSIZE', 12) +define(`FUNCTION', +` keycode $1 = `F'$2 VoidSymbol +shift keycode $1 = `F'eval($2 + BANKSIZE) + hyper keycode $1 = `F'eval($2 + BANKSIZE * 2) +shift hyper keycode $1 = `F'eval($2 + BANKSIZE * 3) + alt keycode $1 = `Console_'$2 +shift alt keycode $1 = `Console_'eval($2 + BANKSIZE) + hyper alt keycode $1 = `Console_'eval($2 + BANKSIZE * 2) +shift hyper alt keycode $1 = `Console_'eval($2 + BANKSIZE * 3)') + +dnl For the keypad digits. KPDIGIT(KEYCODE, DIGIT). +define(`KPDIGIT', +` keycode $1 = KP_$2 VoidSymbol +shift keycode $1 = KP_$2 + alt keycode $1 = Ascii_$2 +shift alt keycode $1 = Ascii_$2 +METAHYPER($1, Ascii_$2)') + +dnl And a special approximation: +define(`Meta_Return', `Meta_Control_m') + + +KEY(1, Escape, Escape) + +FUNCTION(59, 1) +FUNCTION(60, 2) +FUNCTION(61, 3) +FUNCTION(62, 4) +FUNCTION(63, 5) +FUNCTION(64, 6) +FUNCTION(65, 7) +FUNCTION(66, 8) +FUNCTION(67, 9) +FUNCTION(68, 10) +FUNCTION(87, 11) +FUNCTION(88, 12) + +KEY(2, one, exclam) + HYPER(2, exclamdown) + METAHYPER(2, Hex_1) +KEY(3, two, at) + CONTROL(3, nul) + METAHYPER(3, Hex_2) +KEY(4, three, numbersign) + HYPER(4, pound) + METAHYPER(4, Hex_3) +KEY(5, four, dollar) + HYPER(5, currency) + METAHYPER(5, Hex_4) +KEY(6, five, percent) + HYPER(6, division) + METAHYPER(6, Hex_5) +KEY(7, six, asciicircum) + CONTROL(7, Control_asciicircum) + HYPER(7, dead_circumflex) + METAHYPER(7, Hex_6) +KEY(8, seven, ampersand) + METAHYPER(8, Hex_7) +KEY(9, eight, asterisk) + METAHYPER(9, Hex_8) +KEY(10, nine, parenleft) + METAHYPER(10, Hex_9) +KEY(11, zero, parenright) + HYPER(11, degree) + METAHYPER(11, Hex_0) +KEY(12, minus, underscore) + CONTROL(12, Control_underscore) + HYPER(12, hyphen) +KEY(13, equal, plus) + HYPER(13, macron) +KEY(14, Delete, Delete) + CONTROL(14, BackSpace) + +KEY(15, Tab, Tab) + HYPER(15, Caps_Lock) +LETTER(16, q) + HYPER(16, onequarter) +LETTER(17, w) + HYPER(17, onehalf) +LETTER(18, e) + HYPER(18, threequarters) + METAHYPER(18, Hex_E) +LETTER(19, r) + HYPER(19, registered) +LETTER(20, t) + HYPER(20, dead_tilde) +LETTER(21, y) + HYPER(21, yen) +LETTER(22, u) + HYPER(22, mu) +LETTER(23, i) +LETTER(24, o) + HYPER(24, masculine) +LETTER(25, p) + HYPER(25, 182) # pilcrow +KEY(26, bracketleft, braceleft) + CONTROL(26, Escape) + HYPER(26, plusminus) +KEY(27, bracketright, braceright) + CONTROL(27, Control_bracketright) + HYPER(27, notsign) + +KEY(28, Return, Return) + +LETTER(30, a) + HYPER(30, ordfeminine) + METAHYPER(30, Hex_A) +LETTER(31, s) + HYPER(31, section) +LETTER(32, d) + HYPER(32, dead_diaeresis) + METAHYPER(32, Hex_D) +LETTER(33, f) + METAHYPER(33, Hex_F) +LETTER(34, g) +LETTER(35, h) + HYPER(35, cent) +LETTER(36, j) + HYPER(36, onesuperior) +LETTER(37, k) + HYPER(37, twosuperior) +LETTER(38, l) + HYPER(38, threesuperior) +KEY(39, semicolon, colon) + HYPER(39, periodcentered) +KEY(40, apostrophe, quotedbl) + HYPER(40, dead_acute) +KEY(41, grave, asciitilde) + HYPER(41, dead_grave) + +KEY(43, backslash, bar) + CONTROL(43, Control_backslash) + HYPER(43, brokenbar) +LETTER(44, z) +LETTER(45, x) + HYPER(45, multiplication) +LETTER(46, c) + HYPER(46, copyright) + METAHYPER(46, Hex_C) +LETTER(47, v) +LETTER(48, b) + METAHYPER(48, Hex_B) +LETTER(49, n) +LETTER(50, m) +KEY(51, comma, less) + HYPER(51, guillemotleft) +KEY(52, period, greater) + HYPER(52, guillemotright) +KEY(53, slash, question) + HYPER(53, questiondown) + +KEY(57, space, space) + CONTROL(57, nul) + HYPER(57, nobreakspace) + +KPDIGIT(71, 7) +KPDIGIT(72, 8) +KPDIGIT(73, 9) +SIMPLE(74, KP_Subtract) +KPDIGIT(75, 4) +KPDIGIT(76, 5) +KPDIGIT(77, 6) +SIMPLE(78, KP_Add) +KPDIGIT(79, 1) +KPDIGIT(80, 2) +KPDIGIT(81, 3) +KPDIGIT(82, 0) +SIMPLE(83, KP_Period) +SIMPLE(96, KP_Enter) +SIMPLE(98, KP_Divide) +SIMPLE(55, KP_Multiply) +SIMPLE(118, KP_MinPlus) + +# Modifiers. +keycode 42 = Shift +keycode 54 = Shift +keycode 56 = Alt +keycode 100 = Alt +keycode 58 = CAPSLOCK_K +keycode 29 = LEFTCTRL_K +keycode 97 = RIGHTCTRL_K + +# Everyone needs a compose key. This is C-.. +control keycode 52 = Compose + +SIMPLE(69, Num_Lock) + +keycode 70 = Scroll_Lock + shift keycode 70 = Show_Memory + control keycode 70 = Show_State + alt keycode 70 = Show_Registers + +# SysRq. I suppose there's some reason it's ^\. +SIMPLE(99, Control_backslash) + +SIMPLE(119, Pause) +# Ctrl-Break seems to have low-level hardware behind it. +SIMPLE(101, Break) + +SIMPLE(110, Insert) +SIMPLE(102, Find) +keycode 104 = Prior Scroll_Backward +SIMPLE(111, Remove) +SIMPLE(107, Select) +keycode 109 = Next Scroll_Forward + +SIMPLE(103, Up) +SIMPLE(105, Left) +alt keycode 105 = Decr_Console +SIMPLE(106, Right) +alt keycode 106 = Incr_Console +SIMPLE(108, Down) + +control alt keycode 83 = Boot +control alt keycode 111 = Boot + + +# Stock VT102 string definitions. +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" + +# Stock ISO-8859-1 compositions. +changequote()dnl +compose '`' 'A' to '' +compose '`' 'a' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '^' 'A' to '' +compose '^' 'a' to '' +compose '~' 'A' to '' +compose '~' 'a' to '' +compose '"' 'A' to '' +compose '"' 'a' to '' +compose 'O' 'A' to '' +compose 'o' 'a' to '' +compose '0' 'A' to '' +compose '0' 'a' to '' +compose 'A' 'A' to '' +compose 'a' 'a' to '' +compose 'A' 'E' to '' +compose 'a' 'e' to '' +compose ',' 'C' to '' +compose ',' 'c' to '' +compose '`' 'E' to '' +compose '`' 'e' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '^' 'E' to '' +compose '^' 'e' to '' +compose '"' 'E' to '' +compose '"' 'e' to '' +compose '`' 'I' to '' +compose '`' 'i' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '^' 'I' to '' +compose '^' 'i' to '' +compose '"' 'I' to '' +compose '"' 'i' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '~' 'N' to '' +compose '~' 'n' to '' +compose '`' 'O' to '' +compose '`' 'o' to '' +compose '\'' 'O' to '' +compose '\'' 'o' to '' +compose '^' 'O' to '' +compose '^' 'o' to '' +compose '~' 'O' to '' +compose '~' 'o' to '' +compose '"' 'O' to '' +compose '"' 'o' to '' +compose '/' 'O' to '' +compose '/' 'o' to '' +compose '`' 'U' to '' +compose '`' 'u' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '^' 'U' to '' +compose '^' 'u' to '' +compose '"' 'U' to '' +compose '"' 'u' to '' +compose '\'' 'Y' to '' +compose '\'' 'y' to '' +compose 'T' 'H' to '' +compose 't' 'h' to '' +compose 's' 's' to '' +compose '"' 'y' to '' +compose 's' 'z' to '' +compose 'i' 'j' to '' + +# ISO-8859-3 compositions for Esperanto. +compose 'C' 'x' to '' #198 +compose 'G' 'x' to '' #216 +compose 'H' 'x' to '' #166 +compose 'J' 'x' to '' #172 +compose 'S' 'x' to '' #222 +compose 'U' 'x' to '' #221 +compose 'c' 'x' to '' #230 +compose 'g' 'x' to '' #248 +compose 'h' 'x' to '' #182 +compose 'j' 'x' to '' #188 +compose 's' 'x' to '' #254 +compose 'u' 'x' to '' #253 diff --git a/console/all/usr/share/keymaps/i386/qwerty/il-heb.map.gz b/console/all/usr/share/keymaps/i386/qwerty/il-heb.map.gz new file mode 100755 index 00000000..b76099ad Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/il-heb.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/il-phonetic.map.gz b/console/all/usr/share/keymaps/i386/qwerty/il-phonetic.map.gz new file mode 100755 index 00000000..efb89260 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/il-phonetic.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/il.map.gz b/console/all/usr/share/keymaps/i386/qwerty/il.map.gz new file mode 100755 index 00000000..0b57c55b Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/il.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/is-latin1-us.map.gz b/console/all/usr/share/keymaps/i386/qwerty/is-latin1-us.map.gz new file mode 100755 index 00000000..7caffb3e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/is-latin1-us.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/is-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/is-latin1.map.gz new file mode 100755 index 00000000..3a738858 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/is-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/it-ibm.map.gz b/console/all/usr/share/keymaps/i386/qwerty/it-ibm.map.gz new file mode 100755 index 00000000..3d79ea16 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/it-ibm.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/it.map.gz b/console/all/usr/share/keymaps/i386/qwerty/it.map.gz new file mode 100755 index 00000000..19bbfbf1 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/it.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/it2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/it2.map.gz new file mode 100755 index 00000000..0ae85c05 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/it2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/jp106.map.gz b/console/all/usr/share/keymaps/i386/qwerty/jp106.map.gz new file mode 100755 index 00000000..ea5d7669 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/jp106.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/kazakh.map.gz b/console/all/usr/share/keymaps/i386/qwerty/kazakh.map.gz new file mode 100755 index 00000000..ed78c27e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/kazakh.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz new file mode 100755 index 00000000..df4a1d19 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/kyrgyz.map.gz b/console/all/usr/share/keymaps/i386/qwerty/kyrgyz.map.gz new file mode 100755 index 00000000..f0060b79 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/kyrgyz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/la-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/la-latin1.map.gz new file mode 100755 index 00000000..8ee67e0d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/la-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/lt.baltic.map.gz b/console/all/usr/share/keymaps/i386/qwerty/lt.baltic.map.gz new file mode 100755 index 00000000..476fd363 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/lt.baltic.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/lt.l4.map.gz b/console/all/usr/share/keymaps/i386/qwerty/lt.l4.map.gz new file mode 100755 index 00000000..31b359c4 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/lt.l4.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/lt.map.gz b/console/all/usr/share/keymaps/i386/qwerty/lt.map.gz new file mode 100755 index 00000000..afb681e2 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/lt.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/lv-tilde.map.gz b/console/all/usr/share/keymaps/i386/qwerty/lv-tilde.map.gz new file mode 100755 index 00000000..af027a83 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/lv-tilde.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/lv.map.gz b/console/all/usr/share/keymaps/i386/qwerty/lv.map.gz new file mode 100755 index 00000000..c16707b3 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/lv.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/mk-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/mk-cp1251.map.gz new file mode 100755 index 00000000..c161a289 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/mk-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/mk-utf.map.gz b/console/all/usr/share/keymaps/i386/qwerty/mk-utf.map.gz new file mode 100755 index 00000000..812cff52 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/mk-utf.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/mk.map.gz b/console/all/usr/share/keymaps/i386/qwerty/mk.map.gz new file mode 100755 index 00000000..cefb60af Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/mk.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/mk0.map.gz b/console/all/usr/share/keymaps/i386/qwerty/mk0.map.gz new file mode 100755 index 00000000..7ea1e01a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/mk0.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/nl.map.gz b/console/all/usr/share/keymaps/i386/qwerty/nl.map.gz new file mode 100755 index 00000000..40f2989f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/nl.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/nl2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/nl2.map.gz new file mode 100755 index 00000000..f1b6af1b Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/nl2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/no-latin1.doc b/console/all/usr/share/keymaps/i386/qwerty/no-latin1.doc new file mode 100755 index 00000000..337d7182 --- /dev/null +++ b/console/all/usr/share/keymaps/i386/qwerty/no-latin1.doc @@ -0,0 +1,50 @@ +/usr/lib/kbd/keymaps/i386/qwerty/no-latin1.map + +This generally conforms to the keycaps on my keyboard. +I have deviated a little to make it more useful in a Unix +environment, e.g. the tilde is not "hidden away" and dead. + +Here's a list of the dead keys: + + ---- + |$| dollar and currency + |4| have switched places + ---- + + ---- -------------------------- + |``| added dead grave: | backtick | dead grave | + |\'| | backslash | dead acute | + ---- -------------------------- + + ---- -------------------------- + |^~| moved dead | caret | dead tilde | + |~| diaeresis: | tilde | dead diaeresis | + ---- -------------------------- + + ---- -------------------------------- + |*| added dead | asterisk | multiply | + |'^| circumflex: | apostrophe | dead circumflex | + ---- -------------------------------- + +In addition special characters have been added to the alphanumerics +when it seemed natural: + + ! " # $ % & / ( ) = ? `` + | 1 2@ 3 4 5 6 7{ 8[ 9] 0} + \' + + Q W E R T Y U I O P ] ^~ + q w e r t y u i o p } ~ + + A S D F G H J K L \ [ * + a s d f g h j k l | { '^ + + > Z X C V B N M ; : _ + < z x c v b n m , . - + + Space NoBreakSpace + Space NoBreakSpace + +Send comments to Kjetil T. Homme + +[ These characters can not be typed directly with the keyboard: + cent notsign macron degree acute(bug) diaeresis(bug) Ccedilla ] diff --git a/console/all/usr/share/keymaps/i386/qwerty/no-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/no-latin1.map.gz new file mode 100755 index 00000000..edff867d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/no-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/no.map.gz b/console/all/usr/share/keymaps/i386/qwerty/no.map.gz new file mode 100755 index 00000000..81252d5d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/no.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pc110.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pc110.map.gz new file mode 100755 index 00000000..96a30c10 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pc110.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pl.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pl.map.gz new file mode 100755 index 00000000..64e00b8e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pl.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pl1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pl1.map.gz new file mode 100755 index 00000000..7ea1d3f4 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pl1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pl2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pl2.map.gz new file mode 100755 index 00000000..15908a13 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pl2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pl3.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pl3.map.gz new file mode 100755 index 00000000..a283ec72 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pl3.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pl4.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pl4.map.gz new file mode 100755 index 00000000..c4867b91 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pl4.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pt-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pt-latin1.map.gz new file mode 100755 index 00000000..2e85fa92 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pt-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/pt-latin9.map.gz b/console/all/usr/share/keymaps/i386/qwerty/pt-latin9.map.gz new file mode 100755 index 00000000..bfdf281d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/pt-latin9.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ro.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ro.map.gz new file mode 100755 index 00000000..ff14d388 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ro.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ro_std.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ro_std.map.gz new file mode 100755 index 00000000..4be7b685 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ro_std.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ro_win.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ro_win.map.gz new file mode 100755 index 00000000..c1e0669e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ro_win.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru-cp1251.map.gz new file mode 100755 index 00000000..4a38a1ee Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru-ms.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru-ms.map.gz new file mode 100755 index 00000000..0e41aae0 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru-ms.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru-yawerty.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru-yawerty.map.gz new file mode 100755 index 00000000..a6c05238 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru-yawerty.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru.map.gz new file mode 100755 index 00000000..a4e423e4 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru1.map.gz new file mode 100755 index 00000000..ba38b20e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru2.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru2.map.gz new file mode 100755 index 00000000..2f99e079 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru2.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru3.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru3.map.gz new file mode 100755 index 00000000..b95be059 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru3.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru4.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru4.map.gz new file mode 100755 index 00000000..7f91560d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru4.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ru_win.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ru_win.map.gz new file mode 100755 index 00000000..9d21819f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ru_win.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz new file mode 100755 index 00000000..3df2f9f1 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz new file mode 100755 index 00000000..fc660bcc Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz new file mode 100755 index 00000000..75297c65 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz new file mode 100755 index 00000000..bc5cb456 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz new file mode 100755 index 00000000..91edd5f1 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz new file mode 100755 index 00000000..1f11905a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz new file mode 100755 index 00000000..d7b5b7bf Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map.gz new file mode 100755 index 00000000..e859fb1d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map.gz new file mode 100755 index 00000000..0041a83e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map.gz new file mode 100755 index 00000000..50a25018 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map.gz new file mode 100755 index 00000000..e93e922f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map.gz new file mode 100755 index 00000000..d91a0a58 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map.gz new file mode 100755 index 00000000..cc6f676d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/se-fi-ir209.map.gz b/console/all/usr/share/keymaps/i386/qwerty/se-fi-ir209.map.gz new file mode 100755 index 00000000..9ed9426c Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/se-fi-ir209.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/se-fi-lat6.map.gz b/console/all/usr/share/keymaps/i386/qwerty/se-fi-lat6.map.gz new file mode 100755 index 00000000..6aa9032a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/se-fi-lat6.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/se-ir209.map.gz b/console/all/usr/share/keymaps/i386/qwerty/se-ir209.map.gz new file mode 100755 index 00000000..f31d7392 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/se-ir209.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/se-lat6.map.gz b/console/all/usr/share/keymaps/i386/qwerty/se-lat6.map.gz new file mode 100755 index 00000000..b42c0095 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/se-lat6.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/sk-prog-qwerty.map.gz b/console/all/usr/share/keymaps/i386/qwerty/sk-prog-qwerty.map.gz new file mode 100755 index 00000000..34cd96f0 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/sk-prog-qwerty.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/sk-qwerty.map.gz b/console/all/usr/share/keymaps/i386/qwerty/sk-qwerty.map.gz new file mode 100755 index 00000000..a6feaa5f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/sk-qwerty.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/sr-cy.map.gz b/console/all/usr/share/keymaps/i386/qwerty/sr-cy.map.gz new file mode 100755 index 00000000..9c313df0 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/sr-cy.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/sv-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/sv-latin1.map.gz new file mode 100755 index 00000000..94f88ec5 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/sv-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/tj_alt-UTF8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/tj_alt-UTF8.map.gz new file mode 100755 index 00000000..82095503 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/tj_alt-UTF8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/tr_q-latin5.map.gz b/console/all/usr/share/keymaps/i386/qwerty/tr_q-latin5.map.gz new file mode 100755 index 00000000..84487dfc Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/tr_q-latin5.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/tralt.map.gz b/console/all/usr/share/keymaps/i386/qwerty/tralt.map.gz new file mode 100755 index 00000000..b3f25dd6 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/tralt.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/trf.map.gz b/console/all/usr/share/keymaps/i386/qwerty/trf.map.gz new file mode 100755 index 00000000..37c79b25 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/trf.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/trq.map.gz b/console/all/usr/share/keymaps/i386/qwerty/trq.map.gz new file mode 100755 index 00000000..c50fe14d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/trq.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ttwin_alt-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ttwin_alt-UTF-8.map.gz new file mode 100755 index 00000000..ecbd40b0 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ttwin_alt-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ttwin_cplk-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ttwin_cplk-UTF-8.map.gz new file mode 100755 index 00000000..95b23841 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ttwin_cplk-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ttwin_ct_sh-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ttwin_ct_sh-UTF-8.map.gz new file mode 100755 index 00000000..752ccc65 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ttwin_ct_sh-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ttwin_ctrl-UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ttwin_ctrl-UTF-8.map.gz new file mode 100755 index 00000000..90454c09 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ttwin_ctrl-UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ua-cp1251.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ua-cp1251.map.gz new file mode 100755 index 00000000..cbac1dce Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ua-cp1251.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ua-utf-ws.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ua-utf-ws.map.gz new file mode 100755 index 00000000..cc861337 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ua-utf-ws.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ua-utf.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ua-utf.map.gz new file mode 100755 index 00000000..544c44f6 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ua-utf.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ua-ws.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ua-ws.map.gz new file mode 100755 index 00000000..c5fadfe6 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ua-ws.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/ua.map.gz b/console/all/usr/share/keymaps/i386/qwerty/ua.map.gz new file mode 100755 index 00000000..b02768b7 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/ua.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/uk.map.gz b/console/all/usr/share/keymaps/i386/qwerty/uk.map.gz new file mode 100755 index 00000000..4402a69e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/uk.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/us-acentos.map.gz b/console/all/usr/share/keymaps/i386/qwerty/us-acentos.map.gz new file mode 100755 index 00000000..3c100a24 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/us-acentos.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/us.map.gz b/console/all/usr/share/keymaps/i386/qwerty/us.map.gz new file mode 100755 index 00000000..79073a95 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/us.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwerty/us1.map.gz b/console/all/usr/share/keymaps/i386/qwerty/us1.map.gz new file mode 100755 index 00000000..6be4015b Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwerty/us1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/croat.map.gz b/console/all/usr/share/keymaps/i386/qwertz/croat.map.gz new file mode 100755 index 00000000..291b813b Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/croat.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/cz-us-qwertz.map.gz b/console/all/usr/share/keymaps/i386/qwertz/cz-us-qwertz.map.gz new file mode 100755 index 00000000..a526ec8e Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/cz-us-qwertz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/cz.map.gz b/console/all/usr/share/keymaps/i386/qwertz/cz.map.gz new file mode 100755 index 00000000..89bcf6d0 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/cz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz b/console/all/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz new file mode 100755 index 00000000..cbbb32ab Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/de-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwertz/de-latin1.map.gz new file mode 100755 index 00000000..a933cf65 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/de-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/de-mobii.map.gz b/console/all/usr/share/keymaps/i386/qwertz/de-mobii.map.gz new file mode 100755 index 00000000..23c40444 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/de-mobii.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/de.map.gz b/console/all/usr/share/keymaps/i386/qwertz/de.map.gz new file mode 100755 index 00000000..0a9ae244 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/de.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/de_CH-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwertz/de_CH-latin1.map.gz new file mode 100755 index 00000000..2ae1a2f2 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/de_CH-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/de_alt_UTF-8.map.gz b/console/all/usr/share/keymaps/i386/qwertz/de_alt_UTF-8.map.gz new file mode 100755 index 00000000..9b08073a Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/de_alt_UTF-8.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/fr_CH-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwertz/fr_CH-latin1.map.gz new file mode 100755 index 00000000..b25bfc29 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/fr_CH-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/fr_CH.map.gz b/console/all/usr/share/keymaps/i386/qwertz/fr_CH.map.gz new file mode 100755 index 00000000..ddadb43d Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/fr_CH.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/hu.map.gz b/console/all/usr/share/keymaps/i386/qwertz/hu.map.gz new file mode 100755 index 00000000..d278c9ec Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/hu.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/sg-latin1-lk450.map.gz b/console/all/usr/share/keymaps/i386/qwertz/sg-latin1-lk450.map.gz new file mode 100755 index 00000000..335260f7 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/sg-latin1-lk450.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/sg-latin1.map.gz b/console/all/usr/share/keymaps/i386/qwertz/sg-latin1.map.gz new file mode 100755 index 00000000..51f1c1df Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/sg-latin1.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/sg.map.gz b/console/all/usr/share/keymaps/i386/qwertz/sg.map.gz new file mode 100755 index 00000000..43ab7cc4 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/sg.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/sk-prog-qwertz.map.gz b/console/all/usr/share/keymaps/i386/qwertz/sk-prog-qwertz.map.gz new file mode 100755 index 00000000..8f438417 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/sk-prog-qwertz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/sk-qwertz.map.gz b/console/all/usr/share/keymaps/i386/qwertz/sk-qwertz.map.gz new file mode 100755 index 00000000..fc1a3a2f Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/sk-qwertz.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/slovene.map.gz b/console/all/usr/share/keymaps/i386/qwertz/slovene.map.gz new file mode 100755 index 00000000..213f4d87 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/slovene.map.gz differ diff --git a/console/all/usr/share/keymaps/i386/qwertz/sr-latin.map.gz b/console/all/usr/share/keymaps/i386/qwertz/sr-latin.map.gz new file mode 100755 index 00000000..213f4d87 Binary files /dev/null and b/console/all/usr/share/keymaps/i386/qwertz/sr-latin.map.gz differ diff --git a/console/all/usr/share/keymaps/include/compose.8859_7 b/console/all/usr/share/keymaps/include/compose.8859_7 new file mode 100755 index 00000000..bcb3db05 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.8859_7 @@ -0,0 +1,24 @@ +# tonos and dialitika +compose '^' '' to '' +compose '^' '' to '' +# tonos +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +compose '\'' '' to '' +# dialitika +compose '"' '' to '' +compose '"' '' to '' +compose '"' '' to '' +compose '"' '' to '' + diff --git a/console/all/usr/share/keymaps/include/compose.8859_8 b/console/all/usr/share/keymaps/include/compose.8859_8 new file mode 100755 index 00000000..3ac8f7a6 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.8859_8 @@ -0,0 +1 @@ +compose 'c' 'h' to '' diff --git a/console/all/usr/share/keymaps/include/compose.latin b/console/all/usr/share/keymaps/include/compose.latin new file mode 100755 index 00000000..8af36f36 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.latin @@ -0,0 +1,260 @@ +# Those compose lines can be shared between latin1, 2 and 3. They give good +# results. +compose '!' '!' to '' +compose '"' 'A' to '' +compose '"' 'E' to '' +compose '"' 'I' to '' +compose '"' 'O' to '' +compose '"' 'U' to '' +compose '"' 'Y' to '' +compose '"' 'a' to '' +compose '"' 'c' to '' +compose '"' 'e' to '' +compose '"' 'i' to '' +compose '"' 'o' to '' +compose '"' 'r' to '' +compose '"' 'u' to '' +compose '"' 'y' to '' +compose '(' 'c' to '' +compose '(' 'r' to '' +compose '+' '-' to '' +compose ',' 'A' to '' +compose ',' 'C' to '' +compose ',' 'E' to '' +compose ',' 'G' to '' +compose ',' 'I' to '' +compose ',' 'K' to '' +compose ',' 'L' to '' +compose ',' 'N' to '' +compose ',' 'R' to '' +compose ',' 'S' to '' +compose ',' 'T' to '' +compose ',' 'U' to '' +compose ',' 'a' to '' +compose ',' 'c' to '' +compose ',' 'e' to '' +compose ',' 'g' to '' +compose ',' 'i' to '' +compose ',' 'k' to '' +compose ',' 'l' to '' +compose ',' 'n' to '' +compose ',' 'r' to '' +compose ',' 's' to '' +compose ',' 't' to '' +compose ',' 'u' to '' +compose '-' ':' to '' +compose '-' 'A' to '' +compose '-' 'C' to '' +compose '-' 'D' to '' +compose '-' 'E' to '' +compose '-' 'H' to '' +compose '-' 'L' to '' +compose '-' 'O' to '' +compose '-' 'T' to '' +compose '-' 'Y' to '' +compose '-' 'a' to '' +compose '-' 'c' to '' +compose '-' 'd' to '' +compose '-' 'e' to '' +compose '-' 'h' to '' +compose '-' 'l' to '' +compose '-' 'l' to '' +compose '-' 'l' to '' +compose '-' 'o' to '' +compose '-' 't' to '' +compose '.' '.' to '' +compose '.' 'C' to '' +compose '.' 'C' to '' +compose '.' 'E' to '' +compose '.' 'I' to '' +compose '.' 'Z' to '' +compose '.' 'c' to '' +compose '.' 'c' to '' +compose '.' 'e' to '' +compose '.' 'i' to '' +compose '.' 'z' to '' +compose '/' 'D' to '' +compose '/' 'L' to '' +compose '/' 'O' to '' +compose '/' 'T' to '' +compose '/' 'c' to '' +compose '/' 'd' to '' +compose '/' 'l' to '' +compose '/' 'o' to '' +compose '/' 't' to '' +compose '0' 'A' to '' +compose '0' 'U' to '' +compose '0' 'a' to '' +compose '0' 'u' to '' +compose '1' '2' to '' +compose '1' '4' to '' +compose '3' '4' to '' +compose ':' '-' to '' +compose ':' 'A' to '' +compose ':' 'E' to '' +compose ':' 'O' to '' +compose ':' 'U' to '' +compose ':' 'a' to '' +compose ':' 'e' to '' +compose ':' 'o' to '' +compose ':' 'u' to '' +compose '<' '<' to '' +compose '>' '>' to '' +compose '?' '?' to '' +compose 'A' 'A' to '' +compose 'A' 'E' to '' +compose 'I' 'J' to '' +compose 'L' '=' to '' +compose 'N' 'G' to '' +compose 'N' 'H' to '' +compose 'N' 'N' to '' +compose 'N' 'Y' to '' +compose 'N' 'h' to '' +compose 'N' 'n' to '' +compose 'N' 'y' to '' +compose 'O' 'A' to '' +compose 'O' 'E' to '' +compose 'O' 'e' to '' +compose 'T' 'H' to '' +compose 'U' 'U' to '' +compose 'Y' '=' to '' +compose '\'' 'A' to '' +compose '\'' 'C' to '' +compose '\'' 'E' to '' +compose '\'' 'I' to '' +compose '\'' 'L' to '' +compose '\'' 'N' to '' +compose '\'' 'O' to '' +compose '\'' 'R' to '' +compose '\'' 'S' to '' +compose '\'' 'U' to '' +compose '\'' 'Y' to '' +compose '\'' 'Z' to '' +compose '\'' 'a' to '' +compose '\'' 'c' to '' +compose '\'' 'e' to '' +compose '\'' 'i' to '' +compose '\'' 'l' to '' +compose '\'' 'n' to '' +compose '\'' 'o' to '' +compose '\'' 'r' to '' +compose '\'' 's' to '' +compose '\'' 'u' to '' +compose '\'' 'y' to '' +compose '\'' 'z' to '' +compose '^' '!' to '' +compose '^' '*' to '' +compose '^' '.' to '' +compose '^' '/' to '' +compose '^' '1' to '' +compose '^' '2' to '' +compose '^' '3' to '' +compose '^' ':' to '' +compose '^' '?' to '' +compose '^' 'A' to '' +#compose '^' 'C' to '' +compose '^' 'C' to '' +#compose '^' 'C' to '' +#compose '^' 'D' to '' +compose '^' 'D' to '' +compose '^' 'E' to '' +#compose '^' 'E' to '' +compose '^' 'G' to '' +compose '^' 'H' to '' +compose '^' 'I' to '' +compose '^' 'J' to '' +compose '^' 'L' to '' +compose '^' 'N' to '' +#compose '^' 'N' to '' +#compose '^' 'O' to '' +#compose '^' 'O' to '' +compose '^' 'R' to '' +compose '^' 'S' to '' +#compose '^' 'S' to '' +#compose '^' 'S' to '' +compose '^' 'T' to '' +compose '^' 'U' to '' +#compose '^' 'Z' to '' +compose '^' 'Z' to '' +compose '^' 'a' to '' +#compose '^' 'c' to '' +compose '^' 'c' to '' +#compose '^' 'c' to '' +#compose '^' 'd' to '' +compose '^' 'd' to '' +compose '^' 'e' to '' +#compose '^' 'e' to '' +compose '^' 'g' to '' +compose '^' 'h' to '' +compose '^' 'i' to '' +compose '^' 'j' to '' +compose '^' 'l' to '' +compose '^' 'n' to '' +#compose '^' 'n' to '' +compose '^' 'o' to '' +compose '^' 'r' to '' +compose '^' 's' to '' +#compose '^' 's' to '' +#compose '^' 's' to '' +compose '^' 't' to '' +compose '^' 'u' to '' +compose '^' 'x' to '' +compose '^' 'z' to '' +#compose '^' 'z' to '' +compose '`' 'A' to '' +#compose '`' 'E' to '' +compose '`' 'E' to '' +compose '`' 'I' to '' +#compose '`' 'I' to '' +compose '`' 'O' to '' +compose '`' 'U' to '' +#compose '`' 'U' to '' +compose '`' 'a' to '' +#compose '`' 'e' to '' +compose '`' 'e' to '' +compose '`' 'i' to '' +#compose '`' 'i' to '' +compose '`' 'o' to '' +#compose '`' 'u' to '' +compose '`' 'u' to '' +#compose '`' 'u' to '' +compose 'a' 'a' to '' +compose 'a' 'e' to '' +compose 'c' '/' to '' +compose 'c' '=' to '' +compose 'e' '=' to '' +compose 'i' 'j' to '' +compose 'm' 'u' to '' +compose 'n' 'g' to '' +compose 'n' 'h' to '' +compose 'n' 'n' to '' +compose 'o' 'a' to '' +compose 'o' 'e' to '' +compose 's' 's' to '' +compose 's' 'z' to '' +compose 't' 'h' to '' +compose 'u' 'u' to '' +compose 'v' 'S' to '' +compose 'v' 'Z' to '' +compose 'v' 's' to '' +compose 'v' 'z' to '' +compose 'x' 'x' to '' +compose '~' 'A' to '' +compose '~' 'G' to '' +compose '~' 'I' to '' +compose '~' 'N' to '' +compose '~' 'O' to '' +#compose '~' 'U' to '' +compose '~' 'U' to '' +compose '~' 'a' to '' +compose '~' 'g' to '' +compose '~' 'i' to '' +compose '~' 'n' to '' +compose '~' 'o' to '' +#compose '~' 'u' to '' +compose '~' 'u' to '' +# +compose '|' 's' to '$' +compose '|' 'S' to '$' +compose 'S' 'S' to '' +# diff --git a/console/all/usr/share/keymaps/include/compose.latin1 b/console/all/usr/share/keymaps/include/compose.latin1 new file mode 100755 index 00000000..b74a98d4 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.latin1 @@ -0,0 +1,172 @@ +compose '`' 'A' to '' +compose '`' 'a' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '^' 'A' to '' +compose '^' 'a' to '' +compose '~' 'A' to '' +compose '~' 'a' to '' +compose '"' 'A' to '' +compose '"' 'a' to '' +compose '-' 'a' to '' +compose '-' 'A' to '' +compose 'O' 'A' to '' +compose 'o' 'a' to '' +compose '0' 'A' to '' +compose '0' 'a' to '' +compose 'A' 'A' to '' +compose 'a' 'a' to '' +compose '' 'A' to '' +compose '' 'a' to '' +compose 'A' 'E' to '' +compose 'a' 'e' to '' +compose ',' 'C' to '' +compose ',' 'c' to '' +compose '^' 'C' to '' +compose '^' 'c' to '' +compose '`' 'E' to '' +compose '`' 'e' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '^' 'E' to '' +compose '^' 'e' to '' +compose '"' 'E' to '' +compose '"' 'e' to '' +compose '`' 'I' to '' +compose '`' 'i' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '^' 'I' to '' +compose '^' 'i' to '' +compose '"' 'I' to '' +compose '"' 'i' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '^' 'D' to '' +compose '^' 'd' to '' +compose '~' 'N' to '' +compose '~' 'n' to '' +compose '^' 'N' to '' +compose '^' 'n' to '' +compose '`' 'O' to '' +compose '`' 'o' to '' +compose '\'' 'O' to '' +compose '\'' 'o' to '' +compose '^' 'O' to '' +compose '^' 'o' to '' +compose '~' 'O' to '' +compose '~' 'o' to '' +compose '"' 'O' to '' +compose '"' 'o' to '' +compose '/' 'O' to '' +compose '/' 'o' to '' +compose '-' 'o' to '' +compose '-' 'O' to '' +compose '`' 'U' to '' +compose '`' 'u' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '^' 'U' to '' +compose '^' 'u' to '' +compose '"' 'U' to '' +compose '"' 'u' to '' +compose '\'' 'Y' to '' +compose '\'' 'y' to '' +compose 'T' 'H' to '' +compose 't' 'h' to '' +compose 's' 's' to '' +compose '"' 'y' to '' +compose 's' 'z' to '' +compose 'n' 'n' to '' +compose 'n' 'h' to '' +compose 'N' 'Y' to '' +compose 'N' 'N' to '' +compose 'N' 'H' to '' +compose 'N' 'y' to '' +compose 'N' 'n' to '' +compose 'N' 'h' to '' +compose '-' 'L' to '' +compose '<' '<' to '' +compose '>' '>' to '' +compose '?' '?' to '' +compose '^' '?' to '' +compose '!' '!' to '' +compose '^' '!' to '' +compose '^' '1' to '' +compose '^' '2' to '' +compose '^' '3' to '' +compose '+' '-' to '' +compose 'c' '=' to '' +compose 'c' '/' to '' +compose '/' 'c' to '' +compose '-' 'c' to '' +compose '-' 'C' to '' +compose '|' 'c' to '' +compose '|' 'C' to '' +compose 'L' '=' to '' +compose '-' 'L' to '' +compose '-' 'l' to '' +compose '^' '*' to '' +compose '^' 'x' to '' +compose 'x' 'x' to '' +compose '^' '.' to '' +compose '.' '.' to '' +compose '^' '/' to '' +compose '^' ':' to '' +compose '-' ':' to '' +compose ':' '-' to '' +# +compose 'Y' '=' to '' +compose '=' 'Y' to '' +compose '-' 'Y' to '' +compose '-' 'l' to '' +# +compose '(' 'c' to '' +compose '"' 'c' to '' +compose 'O' 'C' to '' +compose '(' 'C' to '' +compose 'C' ')' to '' +compose '-' 'a' to '' +compose '-' 'A' to '' +compose '-' 'o' to '' +compose '-' 'O' to '' +# +compose '(' 'r' to '' +compose '"' 'r' to '' +compose 'O' 'R' to '' +compose '(' 'R' to '' +compose 'R' ')' to '' +# +compose 'm' 'u' to '' +compose 'P' 'P' to '' +# +# conflict whith iso-8859-15 +#compose ',' ',' to '' +#compose ',' ' ' to '' +compose '1' '4' to '' +compose '1' '2' to '' +compose '3' '4' to '' +# iso-8859-15 +# euro +compose 'e' '=' to '' +compose '-' 'e' to '' +compose '-' 'E' to '' +compose '=' 'E' to '' +# S< s< Z< z< +compose 'v' 'S' to '' +compose '^' 'S' to '' +compose 'v' 's' to '' +compose '^' 's' to '' +compose 'v' 'Z' to '' +compose '^' 'Z' to '' +compose 'v' 'z' to '' +compose '^' 'z' to '' +# OE oe Y: +compose 'O' 'E' to '' +compose 'O' 'e' to '' +compose 'o' 'e' to '' +compose '"' 'Y' to '' +# those are in fact wrong +# the symbols are LATIN Y WHITH DIAERESIS and not LATIN LIGATURE IJ +compose 'i' 'j' to '' +compose 'I' 'J' to '' diff --git a/console/all/usr/share/keymaps/include/compose.latin2 b/console/all/usr/share/keymaps/include/compose.latin2 new file mode 100755 index 00000000..1fd2e6b6 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.latin2 @@ -0,0 +1,146 @@ +# as dead_ogonek, dead_caron, dead_breve and dead_doubleacute doesn't exist +# (yet), I put also compose lines for use with respectively dead_cedilla, +# dead_circumflex, dead_tilde and dead_tilde +compose '' 'A' to '' +compose '' 'a' to '' +compose '' 'e' to '' +compose '' 'E' to '' +compose ',' 'A' to '' +compose ',' 'a' to '' +compose ',' 'e' to '' +compose ',' 'E' to '' +compose ',' 'S' to '' +compose ',' 's' to '' +compose ',' 'C' to '' +compose ',' 'c' to '' +compose ',' 'T' to '' +compose ',' 't' to '' +compose '' 'a' to '' +compose '' 'A' to '' +compose '~' 'a' to '' +compose '~' 'A' to '' +compose '-' 'l' to '' +compose '-' 'L' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '/' 'l' to '' +compose '/' 'L' to '' +compose '/' 'D' to '' +compose '/' 'd' to '' +compose '\'' 's' to '' +compose '\'' 'S' to '' +compose '\'' 'z' to '' +compose '\'' 'Z' to '' +compose '\'' 'r' to '' +compose '\'' 'R' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '\'' 'l' to '' +compose '\'' 'L' to '' +compose '\'' 'c' to '' +compose '\'' 'C' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '\'' 'n' to '' +compose '\'' 'N' to '' +compose '\'' 'O' to '' +compose '\'' 'o' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '\'' 'Y' to '' +compose '\'' 'y' to '' +compose '"' 'a' to '' +compose '"' 'A' to '' +compose '"' 'e' to '' +compose '"' 'E' to '' +compose '"' 'o' to '' +compose '"' 'O' to '' +compose '"' 'u' to '' +compose '"' 'U' to '' +compose '' 'l' to '' +compose '' 'L' to '' +compose '' 'S' to '' +compose '' 's' to '' +compose '' 'T' to '' +compose '' 't' to '' +compose '' 'Z' to '' +compose '' 'z' to '' +compose '' 'C' to '' +compose '' 'c' to '' +compose '' 'e' to '' +compose '' 'E' to '' +compose '' 'D' to '' +compose '' 'd' to '' +compose '' 'N' to '' +compose '' 'n' to '' +compose '' 'R' to '' +compose '' 'r' to '' +compose '' 'Z' to '' +compose '' 'z' to '' +compose '.' 'Z' to '' +compose '.' 'z' to '' +compose '^' 'A' to '' +compose '^' 'a' to '' +compose '^' 'I' to '' +compose '^' 'i' to '' +compose '^' 'O' to '' +compose '^' 'o' to '' +compose '^' 'l' to '' +compose '^' 'L' to '' +compose '^' 'S' to '' +compose '^' 's' to '' +compose '^' 'T' to '' +compose '^' 't' to '' +compose '^' 'Z' to '' +compose '^' 'z' to '' +compose '^' 'C' to '' +compose '^' 'c' to '' +compose '^' 'e' to '' +compose '^' 'E' to '' +compose '^' 'D' to '' +compose '^' 'd' to '' +compose '^' 'N' to '' +compose '^' 'n' to '' +compose '^' 'R' to '' +compose '^' 'r' to '' +compose '' 'O' to '' +compose '' 'o' to '' +compose '' 'U' to '' +compose '' 'u' to '' +compose '~' 'O' to '' +compose '~' 'o' to '' +compose '~' 'U' to '' +compose '~' 'u' to '' +compose 's' 's' to '' +compose 's' 'z' to '' +compose '-' 'L' to '' +compose '-' 'l' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '' 'U' to '' +compose '' 'u' to '' +compose '0' 'U' to '' +compose '0' 'u' to '' +compose 'U' 'U' to '' +compose 'u' 'u' to '' +compose ':' 'A' to '' +compose ':' 'E' to '' +compose ':' 'O' to '' +compose ':' 'U' to '' +compose ':' 'a' to '' +compose ':' 'e' to '' +compose ':' 'o' to '' +compose ':' 'u' to '' +# +compose '^' '*' to '' +compose '^' 'x' to '' +compose 'x' 'x' to '' +compose '^' '.' to '' +compose '.' '.' to '' +compose '^' '/' to '' +compose '^' ':' to '' +compose '-' ':' to '' +compose ':' '-' to '' + diff --git a/console/all/usr/share/keymaps/include/compose.latin3 b/console/all/usr/share/keymaps/include/compose.latin3 new file mode 100755 index 00000000..34a92d33 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.latin3 @@ -0,0 +1,90 @@ +compose '-' 'H' to '' +compose '-' 'h' to '' +compose '^' 'h' to '' +compose '^' 'H' to '' +compose '^' 'j' to '' +compose '^' 'J' to '' +compose '^' 'a' to '' +compose '^' 'A' to '' +compose '^' 'c' to '' +compose '^' 'C' to '' +compose '^' 'e' to '' +compose '^' 'E' to '' +compose '^' 'o' to '' +compose '^' 'O' to '' +compose '^' 'g' to '' +compose '^' 'G' to '' +compose '^' 'u' to '' +compose '^' 'U' to '' +compose '^' 'S' to '' +compose '^' 's' to '' +compose '' 'i' to '' +compose '' 'I' to '' +compose '' 'c' to '' +compose '' 'C' to '' +compose '' 'c' to '' +compose '' 'C' to '' +compose '.' 'i' to '' +compose '.' 'I' to '' +compose '.' 'c' to '' +compose '.' 'C' to '' +compose '.' 'c' to '' +compose '.' 'C' to '' +compose '' 'U' to '' +compose '' 'u' to '' +compose '' 'G' to '' +compose '' 'g' to '' +compose '~' 'U' to '' +compose '~' 'u' to '' +compose '~' 'G' to '' +compose '~' 'g' to '' +compose '`' 'a' to '' +compose '`' 'A' to '' +compose '`' 'e' to '' +compose '`' 'E' to '' +compose '`' 'i' to '' +compose '`' 'I' to '' +compose '`' 'u' to '' +compose '`' 'O' to '' +compose '`' 'u' to '' +compose '`' 'U' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '\'' 'O' to '' +compose '\'' 'o' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '"' 'a' to '' +compose '"' 'A' to '' +compose '"' 'e' to '' +compose '"' 'E' to '' +compose '"' 'o' to '' +compose '"' 'O' to '' +compose '"' 'u' to '' +compose '"' 'U' to '' +compose ',' 'S' to '' +compose ',' 's' to '' +compose ',' 'C' to '' +compose ',' 'c' to '' +compose '-' 'L' to '' +compose '~' 'n' to '' +compose '~' 'N' to '' +compose '' 'n' to '' +compose '' 'N' to '' +compose 's' 's' to '' +compose 's' 'z' to '' +# +compose '^' '*' to '' +compose '^' 'x' to '' +compose 'x' 'x' to '' +compose '^' '.' to '' +compose '.' '.' to '' +compose '^' '/' to '' +compose '^' ':' to '' +compose '-' ':' to '' +compose ':' '-' to '' + diff --git a/console/all/usr/share/keymaps/include/compose.latin4 b/console/all/usr/share/keymaps/include/compose.latin4 new file mode 100755 index 00000000..8c32d2b8 --- /dev/null +++ b/console/all/usr/share/keymaps/include/compose.latin4 @@ -0,0 +1,122 @@ +# as dead_ogonek, dead_caron, dead_breve and dead_doubleacute doesn't exist +# (yet), I put also compose lines for use with respectively dead_cedilla, +# dead_circumflex, dead_tilde and dead_tilde +compose '' 'A' to '' +compose '' 'a' to '' +compose '' 'e' to '' +compose '' 'E' to '' +compose '' 'U' to '' +compose '' 'u' to '' +compose '' 'I' to '' +compose '' 'i' to '' +compose ',' 'A' to '' +compose ',' 'a' to '' +compose ',' 'e' to '' +compose ',' 'E' to '' +compose ',' 'U' to '' +compose ',' 'u' to '' +compose ',' 'I' to '' +compose ',' 'i' to '' +compose ',' 'R' to '' +compose ',' 'r' to '' +compose ',' 'n' to '' +compose ',' 'N' to '' +compose ',' 'K' to '' +compose ',' 'k' to '' +compose ',' 'l' to '' +compose ',' 'L' to '' +compose ',' 'G' to '' +compose ',' 'g' to '' +compose '`' 'a' to '' +compose '`' 'A' to '' +compose '`' 'E' to '' +compose '`' 'e' to '' +compose '`' 'U' to '' +compose '`' 'u' to '' +compose '`' 'I' to '' +compose '`' 'i' to '' +compose '`' 'O' to '' +compose '`' 'o' to '' +compose '-' 'D' to '' +compose '-' 'd' to '' +compose '-' 't' to '' +compose '-' 'T' to '' +compose '/' 'D' to '' +compose '/' 'd' to '' +compose '/' 't' to '' +compose '/' 'T' to '' +compose '~' 'a' to '' +compose '~' 'A' to '' +compose '~' 'i' to '' +compose '~' 'I' to '' +compose '~' 'O' to '' +compose '~' 'o' to '' +compose '~' 'U' to '' +compose '~' 'u' to '' +compose 'O' 'A' to '' +compose 'o' 'a' to '' +compose '0' 'A' to '' +compose '0' 'a' to '' +compose 'A' 'A' to '' +compose 'a' 'a' to '' +compose 'a' 'e' to '' +compose 'A' 'E' to '' +compose '\'' 'A' to '' +compose '\'' 'a' to '' +compose '\'' 'E' to '' +compose '\'' 'e' to '' +compose '\'' 'I' to '' +compose '\'' 'i' to '' +compose '\'' 'U' to '' +compose '\'' 'u' to '' +compose '"' 'a' to '' +compose '"' 'A' to '' +compose '"' 'e' to '' +compose '"' 'E' to '' +compose '"' 'o' to '' +compose '"' 'O' to '' +compose '"' 'u' to '' +compose '"' 'U' to '' +compose '' 'S' to '' +compose '' 's' to '' +compose '' 'Z' to '' +compose '' 'z' to '' +compose '' 'C' to '' +compose '' 'c' to '' +compose '^' 'S' to '' +compose '^' 's' to '' +compose '^' 'Z' to '' +compose '^' 'z' to '' +compose '^' 'C' to '' +compose '^' 'c' to '' +compose '' 'e' to '' +compose '' 'E' to '' +compose '.' 'e' to '' +compose '.' 'E' to '' +compose '' 'e' to '' +compose '' 'E' to '' +compose '/' 'O' to '' +compose '/' 'o' to '' +compose 'N' 'G' to '' +compose 'n' 'g' to '' +compose '^' 'A' to '' +compose '^' 'a' to '' +compose '^' 'I' to '' +compose '^' 'i' to '' +compose '^' 'O' to '' +compose '^' 'o' to '' +compose '^' 'U' to '' +compose '^' 'u' to '' +compose 's' 's' to '' +compose 's' 'z' to '' +# +compose '^' '*' to '' +compose '^' 'x' to '' +compose 'x' 'x' to '' +compose '^' '.' to '' +compose '.' '.' to '' +compose '^' '/' to '' +compose '^' ':' to '' +compose '-' ':' to '' +compose ':' '-' to '' + diff --git a/console/all/usr/share/keymaps/include/vim-compose.latin1 b/console/all/usr/share/keymaps/include/vim-compose.latin1 new file mode 100755 index 00000000..19abd3ba --- /dev/null +++ b/console/all/usr/share/keymaps/include/vim-compose.latin1 @@ -0,0 +1,190 @@ +# Compose ISO-8859-1 characters following vim's digraphs +# (based on the "Default digraphs on non-MS-DOS, non-Win32 machines" table +# (":help digraph_table") of vim 4.6. +# To follow vim's behaviour, we need to give each combination twice +# (both char1 char2 and char2 char1) (":help i_digraph": "If a digraph with +# {char1}{char2} does not exist, a digraph {char2}{char1} is searched for. +# This will help when you don't remember which character comes first.") +# +# By J.H.M.Dassen +# +compose ' ' ' ' to ' ' # 160 NO-BREAK SPACE (not a vim digraph) +compose '!' '~' to '' # 161 INVERTED EXCLAMATION MARK +compose '~' '!' to '' # 161 +compose 'c' '|' to '' # 162 CENT SIGN +compose '|' 'c' to '' # 162 +compose '$' '$' to '' # 163 POUND SIGN +compose 'o' 'x' to '' # 164 CURRENCY SIGN +compose 'x' 'o' to '' # 164 +compose '-' 'Y' to '' # 165 YEN SIGN +compose 'Y' '-' to '' # 165 +compose '|' '|' to '' # 166 BROKEN BAR +compose 'a' 'p' to '' # 167 SECTION SIGN +compose 'p' 'a' to '' # 167 +compose '"' '"' to '' # 168 DIAERESIS +compose 'O' 'c' to '' # 169 COPYRIGHT SIGN +compose 'c' 'O' to '' # 169 +compose '-' 'a' to '' # 170 FEMININE ORDINAL INDICATOR +compose 'a' '-' to '' # 170 +compose '<' '<' to '' # 171 LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +compose ',' '-' to '' # 172 NOT SIGN +compose '-' ',' to '' # 172 +compose '-' '-' to '' # 173 SOFT HYPHEN +compose 'O' 'r' to '' # 174 REGISTERED SIGN +compose 'r' 'O' to '' # 174 +compose '-' '=' to '' # 175 MACRON +compose '=' '-' to '' # 175 +compose '~' 'o' to '' # 176 DEGREE SIGN +compose '+' '-' to '' # 177 PLUS-MINUS SIGN +compose '-' '+' to '' # 177 +compose '2' '2' to '' # 178 SUPERSCRIPT TWO +compose '3' '3' to '' # 179 SUPERSCRIPT THREE +compose ''' ''' to '' # 180 ACUTE ACCENT +compose 'j' 'u' to '' # 181 MICRO SIGN +compose 'u' 'j' to '' # 181 +compose 'p' 'p' to '' # 182 PILCROW SIGN +compose '.' '~' to '' # 183 MIDDLE DOT +compose '~' '.' to '' # 183 +compose ',' ',' to '' # 184 CEDILLA +compose '1' '1' to '' # 185 SUPERSCRIPT ONE +compose '-' 'o' to '' # 186 MASCULINE ORDINAL INDICATOR +compose 'o' '-' to '' # 186 +compose '>' '>' to '' # 187 RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +compose '1' '4' to '' # 188 VULGAR FRACTION ONE QUARTER +compose '4' '1' to '' # 188 +compose '1' '2' to '' # 189 VULGAR FRACTION ONE HALF +compose '2' '1' to '' # 189 +compose '3' '4' to '' # 190 VULGAR FRACTION THREE QUARTERS +compose '4' '3' to '' # 190 +compose '?' '~' to '' # 191 INVERTED QUESTION MARK +compose '~' '?' to '' # 191 +compose 'A' '`' to '' # 192 LATIN CAPITAL LETTER A WITH GRAVE +compose '`' 'A' to '' # 192 +compose ''' 'A' to '' # 193 LATIN CAPITAL LETTER A WITH ACUTE +compose 'A' ''' to '' # 193 +compose 'A' '^' to '' # 194 LATIN CAPITAL LETTER A WITH CIRCUMFLEX +compose '^' 'A' to '' # 194 +compose 'A' '~' to '' # 195 LATIN CAPITAL LETTER A WITH TILDE +compose '~' 'A' to '' # 195 +compose '"' 'A' to '' # 196 LATIN CAPITAL LETTER A WITH DIAERESIS +compose 'A' '"' to '' # 196 +compose '@' 'A' to '' # 197 LATIN CAPITAL LETTER A WITH RING ABOVE +compose 'A' '@' to '' # 197 +compose 'A' 'E' to '' # 198 LATIN CAPITAL LIGATURE AE +compose 'E' 'A' to '' # 198 +compose ',' 'C' to '' # 199 LATIN CAPITAL LETTER C WITH CEDILLA +compose 'C' ',' to '' # 199 +compose 'E' '`' to '' # 200 LATIN CAPITAL LETTER E WITH GRAVE +compose '`' 'E' to '' # 200 +compose ''' 'E' to '' # 201 LATIN CAPITAL LETTER E WITH ACUTE +compose 'E' ''' to '' # 201 +compose 'E' '^' to '' # 202 LATIN CAPITAL LETTER E WITH CIRCUMFLEX +compose '^' 'E' to '' # 202 +compose '"' 'E' to '' # 203 LATIN CAPITAL LETTER E WITH DIAERESIS +compose 'E' '"' to '' # 203 +compose 'I' '`' to '' # 204 LATIN CAPITAL LETTER I WITH GRAVE +compose '`' 'I' to '' # 204 +compose ''' 'I' to '' # 205 LATIN CAPITAL LETTER I WITH ACUTE +compose 'I' ''' to '' # 205 +compose 'I' '^' to '' # 206 LATIN CAPITAL LETTER I WITH CIRCUMFLEX +compose '^' 'I' to '' # 206 +compose '"' 'I' to '' # 207 LATIN CAPITAL LETTER I WITH DIAERESIS +compose 'I' '"' to '' # 207 +compose '-' 'D' to '' # 208 LATIN CAPITAL LETTER ETH +compose 'D' '-' to '' # 208 +compose 'N' '~' to '' # 209 LATIN CAPITAL LETTER N WITH TILDE +compose '~' 'N' to '' # 209 +compose 'O' '`' to '' # 210 LATIN CAPITAL LETTER O WITH GRAVE +compose '`' 'O' to '' # 210 +compose ''' 'O' to '' # 211 LATIN CAPITAL LETTER O WITH ACUTE +compose 'O' ''' to '' # 211 +compose 'O' '^' to '' # 212 LATIN CAPITAL LETTER O WITH CIRCUMFLEX +compose '^' 'O' to '' # 212 +compose 'O' '~' to '' # 213 LATIN CAPITAL LETTER O WITH TILDE +compose '~' 'O' to '' # 213 +compose '"' 'O' to '' # 214 LATIN CAPITAL LETTER O WITH DIAERESIS +compose 'O' '"' to '' # 214 +compose '/' '\' to '' # 215 MULTIPLICATION SIGN +compose '\' '/' to '' # 215 +compose '/' 'O' to '' # 216 LATIN CAPITAL LETTER O WITH STROKE +compose 'O' '/' to '' # 216 +compose 'U' '`' to '' # 217 LATIN CAPITAL LETTER U WITH GRAVE +compose '`' 'U' to '' # 217 +compose ''' 'U' to '' # 218 LATIN CAPITAL LETTER U WITH ACUTE +compose 'U' ''' to '' # 218 +compose 'U' '^' to '' # 219 LATIN CAPITAL LETTER U WITH CIRCUMFLEX +compose '^' 'U' to '' # 219 +compose '"' 'U' to '' # 220 LATIN CAPITAL LETTER U WITH DIAERESIS +compose 'U' '"' to '' # 220 +compose ''' 'Y' to '' # 221 LATIN CAPITAL LETTER Y WITH ACUTE +compose 'Y' ''' to '' # 221 +compose 'I' 'p' to '' # 222 LATIN CAPITAL LETTER THORN +compose 'p' 'I' to '' # 222 +compose 's' 's' to '' # 223 LATIN SMALL LETTER SHARP S +compose '`' 'a' to '' # 224 LATIN SMALL LETTER A WITH GRAV +compose 'a' '`' to '' # 224 +compose ''' 'a' to '' # 225 LATIN SMALL LETTER A WITH ACUTE +compose 'a' ''' to '' # 225 +compose '^' 'a' to '' # 226 LATIN SMALL LETTER A WITH CIRCUMFLEX +compose 'a' '^' to '' # 226 +compose 'a' '~' to '' # 227 LATIN SMALL LETTER A WITH TILDE +compose '~' 'a' to '' # 227 +compose '"' 'a' to '' # 228 LATIN SMALL LETTER A WITH DIAERESIS +compose 'a' '"' to '' # 228 +compose '@' 'a' to '' # 229 LATIN SMALL LETTER A WITH RING ABOVE +compose 'a' '@' to '' # 229 +compose 'a' 'e' to '' # 230 LATIN SMALL LIGATURE AE +compose 'e' 'a' to '' # 230 +compose ',' 'c' to '' # 231 LATIN SMALL LETTER C WITH CEDILLA +compose 'c' ',' to '' # 231 +compose '`' 'e' to '' # 232 LATIN SMALL LETTER E WITH GRAVE +compose 'e' '`' to '' # 232 +compose ''' 'e' to '' # 233 LATIN SMALL LETTER E WITH ACUTE +compose 'e' ''' to '' # 233 +compose '^' 'e' to '' # 234 LATIN SMALL LETTER E WITH CIRCUMFLEX +compose 'e' '^' to '' # 234 +compose '"' 'e' to '' # 235 LATIN SMALL LETTER E WITH DIAERESIS +compose 'e' '"' to '' # 235 +compose '`' 'i' to '' # 236 LATIN SMALL LETTER I WITH GRAVE +compose 'i' '`' to '' # 236 +compose ''' 'i' to '' # 237 LATIN SMALL LETTER I WITH ACUTE +compose 'i' ''' to '' # 237 +compose '^' 'i' to '' # 238 LATIN SMALL LETTER I WITH CIRCUMFLEX +compose 'i' '^' to '' # 238 +compose '"' 'i' to '' # 239 LATIN SMALL LETTER I WITH DIAERESIS +compose 'i' '"' to '' # 239 +compose '-' 'd' to '' # 240 LATIN SMALL LETTER ETH +compose 'd' '-' to '' # 240 +compose 'n' '~' to '' # 241 LATIN SMALL LETTER N WITH TILDE +compose '~' 'n' to '' # 241 +compose '`' 'o' to '' # 242 LATIN SMALL LETTER O WITH GRAVE +compose 'o' '`' to '' # 242 +compose ''' 'o' to '' # 243 LATIN SMALL LETTER O WITH ACUTE +compose 'o' ''' to '' # 243 +compose '^' 'o' to '' # 244 LATIN SMALL LETTER O WITH CIRCUMFLEX +compose 'o' '^' to '' # 244 +compose 'o' '~' to '' # 245 LATIN SMALL LETTER O WITH TILDE +compose '"' 'o' to '' # 246 LATIN SMALL LETTER O WITH DIAERESIS +compose 'o' '"' to '' # 246 +compose '-' ':' to '' # 247 DIVISION SIGN +compose ':' '-' to '' # 247 +compose '/' 'o' to '' # 248 LATIN SMALL LETTER O WITH STROKE +compose 'o' '/' to '' # 248 +compose '`' 'u' to '' # 249 LATIN SMALL LETTER U WITH GRAVE +compose 'u' '`' to '' # 249 +compose ''' 'u' to '' # 250 LATIN SMALL LETTER U WITH ACUTE +compose 'u' ''' to '' # 250 +compose '^' 'u' to '' # 251 LATIN SMALL LETTER U WITH CIRCUMFLEX +compose 'u' '^' to '' # 251 +compose '"' 'u' to '' # 252 LATIN SMALL LETTER U WITH DIAERESIS +compose 'u' '"' to '' # 252 +compose ''' 'y' to '' # 253 LATIN SMALL LETTER Y WITH ACUTE +compose 'y' ''' to '' # 253 +compose 'i' 'p' to '' # 254 LATIN SMALL LETTER THORN +compose 'p' 'i' to '' # 254 +compose '"' 'y' to '' # 255 LATIN SMALL LETTER Y WITH DIAERESIS +compose 'y' '"' to '' # 255 +# +## ^K introduces digraphs in vim. +# control keycode 37 = Compose + diff --git a/console/install.sh b/console/install.sh new file mode 100755 index 00000000..626174ca --- /dev/null +++ b/console/install.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env ash + +if [ "${1}" = "modules" ]; then + echo "Loading FB and console modules..." + if [ -n "${2}" ]; then + /usr/sbin/modprobe ${2} + else + for M in i915 efifb vesafb vga16fb; do + [ -e /sys/class/graphics/fb0 ] && break + /usr/sbin/modprobe ${M} + done + fi + /usr/sbin/modprobe fbcon + echo "Arc console - wait..." >/dev/tty1 + # Workaround for DVA1622 + if [ "${MODEL}" = "DVA1622" ]; then + echo >/dev/tty2 + /usr/bin/ioctl /dev/tty0 22022 -v 2 + /usr/bin/ioctl /dev/tty0 22022 -v 1 + fi +elif [ "${1}" = "rcExit" ]; then + # Run only in junior mode (DSM not installed) + echo -e "Junior mode\n" >/etc/issue + echo "Starting getty..." + /usr/sbin/getty -L 0 tty1 & + /usr/bin/loadkeys /usr/share/keymaps/i386/${LAYOUT:-qwertz}/${KEYMAP:-de}.map.gz + # Workaround for DVA1622 + if [ "${MODEL}" = "DVA1622" ]; then + echo >/dev/tty2 + /usr/bin/ioctl /dev/tty0 22022 -v 2 + /usr/bin/ioctl /dev/tty0 22022 -v 1 + fi +elif [ "${1}" = "late" ]; then + echo "Installing addon console" + SED_PATH='/tmpRoot/usr/bin/sed' + # run when boot installed DSM + cp -fv /tmpRoot/lib/systemd/system/serial-getty\@.service /tmpRoot/lib/systemd/system/getty\@.service + ${SED_PATH} -i 's|^ExecStart=.*|ExecStart=/sbin/agetty %I 115200 linux|' /tmpRoot/lib/systemd/system/getty\@.service + mkdir -vp /tmpRoot/lib/systemd/system/getty.target.wants + ln -vsf /lib/systemd/system/getty\@.service /tmpRoot/lib/systemd/system/getty.target.wants/getty\@tty1.service + echo -e "DSM mode\n" >/tmpRoot/etc/issue + cp -vfR /usr/share/keymaps /tmpRoot/usr/share/ + cp -fv /usr/bin/loadkeys /tmpRoot/usr/bin/ + cp -fv /usr/bin/setleds /tmpRoot/usr/bin/ + [ -f "/tmpRoot/lib/systemd/system/keymap.service" ] && rm -f "/tmpRoot/lib/systemd/system/keymap.service" + DEST="/tmpRoot/lib/systemd/system/keymap.service" + echo "[Unit]" >${DEST} + echo "Description=Configure keymap" >>${DEST} + echo "After=getty.target" >>${DEST} + echo >>${DEST} + echo "[Service]" >>${DEST} + echo "Type=oneshot" >>${DEST} + echo "RemainAfterExit=true" >>${DEST} + echo "ExecStart=/usr/bin/loadkeys /usr/share/keymaps/i386/${LAYOUT:-qwertz}/${KEYMAP:-de}.map.gz" >>${DEST} + echo >>${DEST} + echo "[Install]" >>${DEST} + echo "WantedBy=multi-user.target" >>${DEST} + + mkdir -vp /tmpRoot/lib/systemd/system/multi-user.target.wants + ln -vsf /lib/systemd/system/keymap.service /tmpRoot/lib/systemd/system/multi-user.target.wants/keymap.service + # Workaround for DVA1622 + if [ "${MODEL}" = "DVA1622" ]; then + echo >/dev/tty2 + /usr/bin/ioctl /dev/tty0 22022 -v 2 + /usr/bin/ioctl /dev/tty0 22022 -v 1 + fi +fi \ No newline at end of file diff --git a/usbids/manifest.yml b/console/manifest.yml similarity index 78% rename from usbids/manifest.yml rename to console/manifest.yml index aa1429ba..263433b8 100755 --- a/usbids/manifest.yml +++ b/console/manifest.yml @@ -1,6 +1,6 @@ version: 1 -name: usbids -description: "Update usb.map from latest Linux Source." +name: console +description: "Give a screen console via framebuffer" beta: false all: install-script: "install.sh" diff --git a/disks/install.sh b/disks/install.sh index 195985cb..9d91a6bf 100755 --- a/disks/install.sh +++ b/disks/install.sh @@ -100,34 +100,44 @@ function _kernelVersion() { /bin/echo ${_release%%[-+]*} | /usr/bin/cut -d'.' -f1-3 } -BOOTDISK="" -BOOTDISK_PART3=$(blkid -L ARC3 | sed 's/\/dev\///') -[ -n "${BOOTDISK_PART3}" ] && BOOTDISK=$(ls -d /sys/block/*/${BOOTDISK_PART3} | cut -d'/' -f4) -echo "BOOTDISK=${BOOTDISK}" - # synoboot function checkSynoboot() { [ -b /dev/synoboot -a -b /dev/synoboot1 -a -b /dev/synoboot2 ] && return [ -z "${BOOTDISK}" ] && return - [ ! -b /dev/synoboot -a -d /sys/block/${BOOTDISK} ] && + if [ ! -b /dev/synoboot -a -d /sys/block/${BOOTDISK} ]; then /bin/mknod /dev/synoboot b $(cat /sys/block/${BOOTDISK}/dev | sed 's/:/ /') >/dev/null 2>&1 + rm -vf /dev/${BOOTDISK} + fi # sataN, nvmeXnN, mmcblkN - [ ! -b /dev/synoboot1 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}p1 ] && + if [ ! -b /dev/synoboot1 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}p1 ]; then /bin/mknod /dev/synoboot1 b $(cat /sys/block/${BOOTDISK}/${BOOTDISK}p1/dev | sed 's/:/ /') >/dev/null 2>&1 - [ ! -b /dev/synoboot2 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}p2 ] && + rm -vf /dev/${BOOTDISK}p1 + fi + if [ ! -b /dev/synoboot2 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}p2 ]; then /bin/mknod /dev/synoboot2 b $(cat /sys/block/${BOOTDISK}/${BOOTDISK}p2/dev | sed 's/:/ /') >/dev/null 2>&1 + rm -vf /dev/${BOOTDISK}p2 + fi + if [ ! -b /dev/${BOOTDISK} -a -b /dev/${BOOTDISK}p3 ]; then + rm -vf /dev/${BOOTDISK}p3 + fi # sdN, vdN - [ ! -b /dev/synoboot1 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}1 ] && + if [ ! -b /dev/synoboot1 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}1 ]; then /bin/mknod /dev/synoboot1 b $(cat /sys/block/${BOOTDISK}/${BOOTDISK}1/dev | sed 's/:/ /') >/dev/null 2>&1 - [ ! -b /dev/synoboot2 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}2 ] && + rm -vf /dev/${BOOTDISK}1 + fi + if [ ! -b /dev/synoboot2 -a -d /sys/block/${BOOTDISK}/${BOOTDISK}2 ]; then /bin/mknod /dev/synoboot2 b $(cat /sys/block/${BOOTDISK}/${BOOTDISK}2/dev | sed 's/:/ /') >/dev/null 2>&1 - + rm -vf /dev/${BOOTDISK}2 + fi + if [ ! -b /dev/${BOOTDISK} -a -b /dev/${BOOTDISK}3 ]; then + rm -vf /dev/${BOOTDISK}3 + fi } # USB ports function getUsbPorts() { - for I in $(ls -d /sys/bus/usb/devices/usb*); do + for I in $(ls -d /sys/bus/usb/devices/usb* 2>/dev/null); do # ROOT DCLASS=$(cat ${I}/bDeviceClass) [ ! "${DCLASS}" = "09" ] && continue @@ -161,6 +171,8 @@ function getUsbPorts() { # function dtModel() { + checkSynoboot + DEST="/addons/model.dts" UNIQUE=$(_get_conf_kv unique) if [ ! -f "${DEST}" ]; then # Users can put their own dts. @@ -172,7 +184,7 @@ function dtModel() { # NVME power_limit POWER_LIMIT="" - NVME_PORTS=$(ls /sys/class/nvme | wc -w) + NVME_PORTS=$(ls /sys/class/nvme 2>/dev/null | wc -w) for I in $(seq 0 $((${NVME_PORTS} - 1))); do [ ${I} -eq 0 ] && POWER_LIMIT="100" || POWER_LIMIT="${POWER_LIMIT},100" done @@ -197,16 +209,15 @@ function dtModel() { PCIPATH="00:${PCIPATH:1}" # 5.10- kernel fi - [ -n "${BOOTDISK}" ] && PHYSDEVPATH="$(cat /sys/block/${BOOTDISK}/uevent | grep 'PHYSDEVPATH' | cut -d'=' -f2)" || PHYSDEVPATH="" - if echo "${PHYSDEVPATH}" | grep -q "${P}"; then - ATAPORT=$(grep 'ata_port_no' /sys/block/${BOOTDISK}/device/syno_block_info | cut -d'=' -f2) - checkSynoboot - else - ATAPORT="" + IDX="" + if [ -n "${BOOTDISK_PHYSDEVPATH}" ] && echo "${BOOTDISK_PHYSDEVPATH}" | grep -q "${P}"; then + IDX=$(ls -l /sys/class/scsi_host 2>/dev/null | grep ${P} | sort -V | grep -n "${BOOTDISK_PHYSDEVPATH%%target*}" | head -1 | cut -d: -f1) + if [ -n "${IDX}" ] && echo "${IDX}" | grep -q -E '^[0-9]+$'; then if [ ${IDX} -gt 0 ]; then IDX=$((${IDX} - 1)); else IDX="0"; fi; else IDX=""; fi + echo "bootloader: PCIPATH:${PCIPATH}; IDX:${IDX}" fi for J in $(seq 0 $((${HOSTNUM} - 1))); do - [ "${J}" = "${ATAPORT}" ] && continue + [ "${J}" = "${IDX}" ] && continue echo " internal_slot@${I} {" >>${DEST} echo " protocol_type = \"sata\";" >>${DEST} echo " ahci {" >>${DEST} @@ -217,13 +228,13 @@ function dtModel() { I=$((${I} + 1)) done done - for P in $(lspci -d ::107 2>/dev/null | cut -d' ' -f1); do + for P in $(lspci -d ::107 2>/dev/null | cut -d' ' -f1) $(lspci -d ::104 2>/dev/null | cut -d' ' -f1) $(lspci -d ::100 2>/dev/null | cut -d' ' -f1); do J=1 while true; do [ ! -d /sys/block/sata${J} ] && break if cat /sys/block/sata${J}/uevent | grep 'PHYSDEVPATH' | grep -q "${P}"; then - if [ "sata${J}" = "${BOOTDISK}" ]; then - checkSynoboot + if [ -n "${BOOTDISK_PHYSDEVPATH}" -a "${BOOTDISK_PHYSDEVPATH}" = "$(cat /sys/block/sata${J}/uevent | grep 'PHYSDEVPATH' | cut -d'=' -f2)" ]; then + echo "bootloader: /sys/block/sata${J}" else PCIEPATH=$(grep 'pciepath' /sys/block/sata${J}/device/syno_block_info 2>/dev/null | cut -d'=' -f2) ATAPORT=$(grep 'ata_port_no' /sys/block/sata${J}/device/syno_block_info 2>/dev/null | cut -d'=' -f2) @@ -247,8 +258,8 @@ function dtModel() { J=1 while true; do [ ! -d /sys/block/sata${J} ] && break - if [ "sata${J}" = "${BOOTDISK}" ]; then - checkSynoboot + if [ -n "${BOOTDISK_PHYSDEVPATH}" -a "${BOOTDISK_PHYSDEVPATH}" = "$(cat /sys/block/sata${J}/uevent | grep 'PHYSDEVPATH' | cut -d'=' -f2)" ]; then + echo "bootloader: /sys/block/sata${J}" else PCIEPATH=$(grep 'pciepath' /sys/block/sata${J}/device/syno_block_info 2>/dev/null | cut -d'=' -f2) ATAPORT=$(grep 'ata_port_no' /sys/block/sata${J}/device/syno_block_info 2>/dev/null | cut -d'=' -f2) @@ -277,8 +288,8 @@ function dtModel() { # NVME ports COUNT=1 for P in $(ls -d /sys/block/nvme* 2>/dev/null); do - if [ "/sys/block/${BOOTDISK}" = "${P}" ]; then - checkSynoboot + if [ -n "${BOOTDISK_PHYSDEVPATH}" -a "${BOOTDISK_PHYSDEVPATH}" = "$(cat ${P}/uevent | grep 'PHYSDEVPATH' | cut -d'=' -f2)" ]; then + echo "bootloader: ${P}" continue fi PCIEPATH=$(grep 'pciepath' ${P}/device/syno_block_info 2>/dev/null | cut -d'=' -f2) @@ -291,8 +302,6 @@ function dtModel() { fi done - checkSynoboot - # USB ports COUNT=1 for I in $(getUsbPorts); do @@ -320,13 +329,20 @@ function nondtModel() { INTERNALPORTCFG=0 HBA_NUMBER=$(lspci -d ::107 2>/dev/null | wc -l) - for I in $(ls -d /sys/block/sd*); do + for I in $(ls -d /sys/block/sd* 2>/dev/null); do IDX=$(_atoi ${I/\/sys\/block\/sd/}) ISUSB="$(cat ${I}/uevent 2>/dev/null | grep PHYSDEVPATH | grep usb)" [ -n "${ISUSB}" ] && USBPORTCFG=$((${USBPORTCFG} | $((1 << ${IDX})))) [ $((${IDX} + 1)) -ge ${MAXDISKS} ] && MAXDISKS=$((${IDX} + 1)) done + if _check_post_k "rd" "maxdisks"; then + MAXDISKS=$(($(_get_conf_kv maxdisks))) + echo "get maxdisks=${MAXDISKS}" + else + #[ ${HBA_NUMBER} -gt 0 ] && MAXDISKS=26 + [ ${MAXDISKS} -lt 26 ] && MAXDISKS=26 + fi if _check_post_k "rd" "usbportcfg"; then USBPORTCFG=$(($(_get_conf_kv usbportcfg))) echo "get usbportcfg=${USBPORTCFG}" @@ -350,12 +366,6 @@ function nondtModel() { echo "set internalportcfg=${INTERNALPORTCFG}" fi - if _check_post_k "rd" "maxdisks"; then - MAXDISKS=$(($(_get_conf_kv maxdisks))) - echo "get maxdisks=${MAXDISKS}" - else - [ ${HBA_NUMBER} -gt 0 ] && MAXDISKS=26 - fi # Raidtool will read maxdisks, but when maxdisks is greater than 27, formatting error will occur 8%. if ! _check_rootraidstatus && [ ${MAXDISKS} -gt 26 ]; then _set_conf_kv rd "maxdisks" "26" @@ -369,14 +379,18 @@ function nondtModel() { echo "set maxdisks=${MAXDISKS}" fi + if [ "${1}" = "true" ]; then + echo "TODO: no-DT's sort!!!" + fi + checkSynoboot # NVME COUNT=1 echo "[pci]" >/etc/extensionPorts for P in $(ls -d /sys/block/nvme* 2>/dev/null); do - if [ "/sys/block/${BOOTDISK}" = "${P}" ]; then - checkSynoboot + if [ -n "${BOOTDISK_PHYSDEVPATH}" -a "${BOOTDISK_PHYSDEVPATH}" = "$(cat ${P}/uevent | grep 'PHYSDEVPATH' | cut -d'=' -f2)" ]; then + echo "bootloader: ${P}" continue fi PCIEPATH=$(cat ${P}/uevent 2>/dev/null | grep 'PHYSDEVPATH' | cut -d'/' -f4) @@ -399,8 +413,16 @@ function nondtModel() { # if [ "${1}" = "patches" ]; then echo "Adjust disks related configs automatically - patches" - UNIQUE=$(_get_conf_kv unique) - [ "$(_get_conf_kv supportportmappingv2)" = "yes" ] && dtModel "${UNIQUE}" || nondtModel "${UNIQUE}" + + BOOTDISK="" + BOOTDISK_PART3=$(blkid -L ARC3 | sed 's/\/dev\///') + [ -n "${BOOTDISK_PART3}" ] && BOOTDISK=$(ls -d /sys/block/*/${BOOTDISK_PART3} 2>/dev/null | cut -d'/' -f4) + [ -n "${BOOTDISK}" ] && BOOTDISK_PHYSDEVPATH="$(cat /sys/block/${BOOTDISK}/uevent | grep 'PHYSDEVPATH' | cut -d'=' -f2)" || BOOTDISK_PHYSDEVPATH="" + echo "BOOTDISK=${BOOTDISK}" + echo "BOOTDISK_PHYSDEVPATH=${BOOTDISK_PHYSDEVPATH}" + + [ "$(_get_conf_kv supportportmappingv2)" = "yes" ] && dtModel "${2}" || nondtModel "${2}" + elif [ "${1}" = "late" ]; then echo "Adjust disks related configs automatically - late" if [ "$(_get_conf_kv supportportmappingv2)" = "yes" ]; then diff --git a/eudev/all/addons/eudev-7.1.tgz b/eudev/all/addons/eudev-7.1.tgz index ba701a24..202963c7 100755 Binary files a/eudev/all/addons/eudev-7.1.tgz and b/eudev/all/addons/eudev-7.1.tgz differ diff --git a/eudev/all/addons/eudev-7.2.tgz b/eudev/all/addons/eudev-7.2.tgz index e9b94e76..65db6dff 100755 Binary files a/eudev/all/addons/eudev-7.2.tgz and b/eudev/all/addons/eudev-7.2.tgz differ diff --git a/eudev/install.sh b/eudev/install.sh index 57e667e3..9dcec8f6 100755 --- a/eudev/install.sh +++ b/eudev/install.sh @@ -3,9 +3,9 @@ # DSM version MajorVersion=$(/bin/get_key_value /etc.defaults/VERSION majorversion) MinorVersion=$(/bin/get_key_value /etc.defaults/VERSION minorversion) -ModuleUnique=$(/bin/get_key_value /etc.defaults/VERSION unique) # Avoid confusion with global variables +#ModuleUnique=$(/bin/get_key_value /etc.defaults/VERSION unique) # Avoid confusion with global variables -echo "eudev: MajorVersion:${MajorVersion} MinorVersion:${MinorVersion}" +echo "MajorVersion:${MajorVersion} MinorVersion:${MinorVersion}" if [ "${1}" = "modules" ]; then echo "Starting eudev daemon - modules" @@ -22,25 +22,41 @@ if [ "${1}" = "modules" ]; then exit 1 } echo "Triggering add events to udev" - udevadm hwdb --update udevadm trigger --type=subsystems --action=add - udevadm trigger --type=subsystems --action=change udevadm trigger --type=devices --action=add udevadm trigger --type=devices --action=change - udevadm settle --timeout=30 || echo "eudev: udevadm settle failed" + udevadm settle --timeout=30 || echo "udevadm settle failed" # Give more time sleep 10 # Remove from memory to not conflict with RAID mount scripts /usr/bin/killall udevd + # Remove kvm module + /usr/sbin/lsmod | grep -q ^kvm_intel && /usr/sbin/rmmod kvm_intel || true # kvm-intel.ko + /usr/sbin/lsmod | grep -q ^kvm_amd && /usr/sbin/rmmod kvm_amd || true # kvm-amd.ko + /usr/sbin/lsmod | grep -q ^kvm && /usr/sbin/rmmod kvm || true + /usr/sbin/lsmod | grep -q ^irqbypass && /usr/sbin/rmmod irqbypass || true + elif [ "${1}" = "late" ]; then echo "Starting eudev daemon - late" - echo "eudev: copy Firmware" + + #echo "eudev: copy HWDB" + #cp -vf /etc/udev/hwdb.d/* /tmpRoot/etc/udev/hwdb.d/ + echo "eudev: copy modules" export LD_LIBRARY_PATH=/tmpRoot/bin:/tmpRoot/lib /tmpRoot/bin/cp -rnf /usr/lib/firmware/* /tmpRoot/usr/lib/firmware/ - echo "eudev: copy Rules" + cat /addons/modulelist 2>/dev/null | /tmpRoot/bin/sed '/^\s*$/d' | while IFS=' ' read -r O M; do + [ "${O:0:1}" = "#" ] && continue + [ -z "${M}" -o -z "$(ls /usr/lib/modules/${M} 2>/dev/null)" ] && continue + if [ "${O}" = "F" ] || [ "${O}" = "f" ]; then + /tmpRoot/bin/cp -vrf /usr/lib/modules/${M} /tmpRoot/usr/lib/modules/ + else + /tmpRoot/bin/cp -vrn /usr/lib/modules/${M} /tmpRoot/usr/lib/modules/ + fi + done + /usr/sbin/depmod -a -b /tmpRoot/ + + echo "Copy rules" cp -vf /usr/lib/udev/rules.d/* /tmpRoot/usr/lib/udev/rules.d/ - echo "eudev: copy HWDB" - cp -vf /etc/udev/hwdb.d/* /tmpRoot/etc/udev/hwdb.d/ [ -f "/tmpRoot/lib/systemd/system/udevrules.service" ] && rm -f "/tmpRoot/lib/systemd/system/udevrules.service" DEST="/tmpRoot/lib/systemd/system/udevrules.service" echo "[Unit]" >${DEST} @@ -51,7 +67,6 @@ elif [ "${1}" = "late" ]; then echo "RemainAfterExit=true" >>${DEST} echo "ExecStart=/usr/bin/udevadm hwdb --update" >>${DEST} echo "ExecStart=/usr/bin/udevadm control --reload-rules" >>${DEST} - echo "ExecStart=/usr/bin/udevadm trigger" >>${DEST} echo >>${DEST} echo "[Install]" >>${DEST} echo "WantedBy=multi-user.target" >>${DEST} diff --git a/expands/install.sh b/expands/install.sh new file mode 100755 index 00000000..a3ec8176 --- /dev/null +++ b/expands/install.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env ash + +if [ "${1}" = "late" ]; then + echo "Installing daemon for expands" + cp -vf /usr/bin/expands.sh /tmpRoot/usr/bin/expands.sh + + DEST="/tmpRoot/usr/lib/systemd/system/expands.service" + echo "[Unit]" >${DEST} + echo "Description=Expanded miscellaneous" >>${DEST} + echo "After=multi-user.target" >>${DEST} + echo >>${DEST} + echo "[Service]" >>${DEST} + echo "Type=oneshot" >>${DEST} + echo "RemainAfterExit=true" >>${DEST} + echo "ExecStart=/usr/bin/expands.sh" >>${DEST} + echo >>${DEST} + echo "[Install]" >>${DEST} + echo "WantedBy=multi-user.target" >>${DEST} + + mkdir -vp /tmpRoot/lib/systemd/system/multi-user.target.wants + ln -vsf /usr/lib/systemd/system/expands.service /tmpRoot/lib/systemd/system/multi-user.target.wants/expands.service +fi diff --git a/certupdate/manifest.yml b/expands/manifest.yml similarity index 68% rename from certupdate/manifest.yml rename to expands/manifest.yml index 06477422..6388d3fe 100644 --- a/certupdate/manifest.yml +++ b/expands/manifest.yml @@ -1,7 +1,7 @@ version: 1 -name: certupdate -description: "Update Certificate for DSM." -beta: true +name: expands +description: "Expanded miscellaneous, updated usb.map, ca-certificates.crt, etc." +system: true all: install-script: "install.sh" copy: "all" diff --git a/expands/usr/bin/expands.sh b/expands/usr/bin/expands.sh new file mode 100755 index 00000000..741b025c --- /dev/null +++ b/expands/usr/bin/expands.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# usb.map +FILE="/usr/syno/etc.defaults/usb.map" +if [ -f "${FILE}" ]; then + STATUS=$(curl -kL -w "%{http_code}" "http://www.linux-usb.org/usb.ids" -o "/tmp/usb.map") + if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then + echo "usb.ids download error!" + else + [ ! -f "${FILE}.bak" ] && cp -f "${FILE}" "${FILE}.bak" + cp -f "/tmp/usb.map" "${FILE}" + if [ -f "${FILE/\.defaults/}" ]; then + [ ! -f "${FILE/\.defaults/}.bak" ] && cp -f "${FILE/\.defaults/}" "${FILE/\.defaults/}.bak" + cp -f "/tmp/usb.map" "${FILE/\.defaults/}" + fi + fi +fi + +# ca-certificates.crt +FILE="/etc/ssl/certs/ca-certificates.crt" +if [ -f "${FILE}" ]; then + STATUS=$(curl -kL -w "%{http_code}" "https://curl.se/ca/cacert.pem" -o "/tmp/cacert.pem") + if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then + echo "ca-certificates.crt download error!" + else + [ ! -f "${FILE}.bak" ] && cp -f "${FILE}" "${FILE}.bak" + cp -f "/tmp/cacert.pem" "${FILE}" + fi +fi + +exit \ No newline at end of file diff --git a/facepatch/all/usr/sbin/facepatch.sh b/facepatch/all/usr/sbin/facepatch.sh deleted file mode 100755 index aed9e2c1..00000000 --- a/facepatch/all/usr/sbin/facepatch.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -SPPATH="/var/packages/SynologyPhotos" - -if [ -d "${SPPATH}" ]; then - -/usr/syno/bin/synopkg stop SynologyPhotos -sleep 10 - -/usr/sbin/PatchELFSharp "/usr/lib/libsynosdk.so.7" "SYNOFSIsRemoteFS" "B8 00 00 00 00 C3" -/usr/sbin/PatchELFSharp "/var/packages/SynologyPhotos/target/usr/lib/libsynophoto-plugin-platform.so" "_ZN9synophoto6plugin8platform20IsSupportedIENetworkEv" "B8 00 00 00 00 C3" - -sleep 5 -/usr/syno/bin/synopkg start SynologyPhotos - -fi \ No newline at end of file diff --git a/facepatch/install.sh b/facepatch/install.sh index f4ffe762..40ad9221 100755 --- a/facepatch/install.sh +++ b/facepatch/install.sh @@ -1,22 +1,26 @@ #!/usr/bin/env ash if [ "${1}" = "late" ]; then - echo "Creating service to exec Facepatch" - cp -vf /usr/sbin/facepatch.sh /tmpRoot/usr/sbin/facepatch.sh - cp -vf /usr/sbin/PatchELFSharp /tmpRoot/usr/sbin/PatchELFSharp - [ -f "/tmpRoot/lib/systemd/system/facepatch.service" ] && rm -f "/tmpRoot/lib/systemd/system/facepatch.service" - DEST="/tmpRoot/lib/systemd/system/facepatch.service" - echo "[Unit]" >${DEST} - echo "Description=Enable Facepatch" >>${DEST} - echo >>${DEST} - echo "[Service]" >>${DEST} - echo "Type=oneshot" >>${DEST} - echo "RemainAfterExit=true" >>${DEST} - echo "ExecStart=/usr/sbin/facepatch.sh" >>${DEST} - echo >>${DEST} - echo "[Install]" >>${DEST} - echo "WantedBy=multi-user.target" >>${DEST} - - mkdir -vp /tmpRoot/lib/systemd/system/multi-user.target.wants - ln -vsf /lib/systemd/system/facepatch.service /tmpRoot/lib/systemd/system/multi-user.target.wants/facepatch.service -fi \ No newline at end of file + echo "Installing daemon for photosfacepatch" + + if [ -f "/tmpRoot/usr/lib/libsynosdk.so.7" ]; then + if [ ! -f "/tmpRoot/usr/lib/libsynosdk.so.7.bak" ]; then + echo "Backup libsynosdk.so.7" + cp -vfp "/tmpRoot/usr/lib/libsynosdk.so.7" "/tmpRoot/usr/lib/libsynosdk.so.7.bak" + fi + echo "Patching libsynosdk.so.7" + PatchELFSharp "/usr/lib/libsynosdk.so.7" "SYNOFSIsRemoteFS" "B8 00 00 00 00 C3" + else + echo "libsynosdk.so.7 not found" + fi + if [ -f "/tmpRoot/var/packages/SynologyPhotos/target/usr/lib/libsynophoto-plugin-platform.so" ]; then + if [ ! -f "/tmpRoot/var/packages/SynologyPhotos/target/usr/lib/libsynophoto-plugin-platform.so.bak" ]; then + echo "Backup libsynophoto-plugin-platform.so" + cp -vfp "/tmpRoot/var/packages/SynologyPhotos/target/usr/lib/libsynophoto-plugin-platform.so" "/tmpRoot/var/packages/SynologyPhotos/target/usr/lib/libsynophoto-plugin-platform.so.bak" + fi + echo "Patching libsynophoto-plugin-platform.so" + PatchELFSharp "/var/packages/SynologyPhotos/target/usr/lib/libsynophoto-plugin-platform.so" "_ZN9synophoto6plugin8platform20IsSupportedIENetworkEv" "B8 00 00 00 00 C3" + else + echo "libsynophoto-plugin-platform.so not found" + fi +fi diff --git a/misc/install.sh b/misc/install.sh index 13cfa4e0..431a37c5 100755 --- a/misc/install.sh +++ b/misc/install.sh @@ -2,10 +2,8 @@ if [ "${1}" = "late" ]; then echo "Script for fixing missing HW features dependencies and another functions" - SED_PATH='/tmpRoot/usr/bin/sed' - XXD_PATH='/tmpRoot/usr/bin/xxd' - LSPCI_PATH='/tmpRoot/usr/bin/lspci' + # Copy Utilities cp -vf "/usr/sbin/loader-reboot.sh" "/tmpRoot/usr/sbin/loader-reboot.sh" cp -vf "/usr/sbin/grub-editenv" "/tmpRoot/usr/sbin/grub-editenv" cp -vf "/usr/bin/less" "/tmpRoot/usr/bin/less" @@ -18,35 +16,34 @@ if [ "${1}" = "late" ]; then CPUFREQ=$(ls -ltr /sys/devices/system/cpu/cpufreq/* 2>/dev/null | wc -l) if [ ${CPUFREQ} -eq 0 ]; then echo "CPU does NOT support CPU Performance Scaling, disabling" - ${SED_PATH} -i 's/^acpi-cpufreq/# acpi-cpufreq/g' /tmpRoot/usr/lib/modules-load.d/70-cpufreq-kernel.conf + sed -i 's/^acpi-cpufreq/# acpi-cpufreq/g' /tmpRoot/usr/lib/modules-load.d/70-cpufreq-kernel.conf else echo "CPU supports CPU Performance Scaling, enabling" - ${SED_PATH} -i 's/^# acpi-cpufreq/acpi-cpufreq/g' /tmpRoot/usr/lib/modules-load.d/70-cpufreq-kernel.conf - cp -vf "/usr/lib/modules/cpufreq_*" "/tmpRoot/usr/lib/modules/" + sed -i 's/^# acpi-cpufreq/acpi-cpufreq/g' /tmpRoot/usr/lib/modules-load.d/70-cpufreq-kernel.conf + cp -vf /usr/lib/modules/cpufreq_* /tmpRoot/usr/lib/modules/ fi fi umount /sys - # crc32c-intel + # crypto-kernel if [ -f /tmpRoot/usr/lib/modules-load.d/70-crypto-kernel.conf ]; then + # crc32c-intel CPUFLAGS=$(cat /proc/cpuinfo | grep flags | grep sse4_2 | wc -l) if [ ${CPUFLAGS} -gt 0 ]; then echo "CPU Supports SSE4.2, crc32c-intel should load" else echo "CPU does NOT support SSE4.2, crc32c-intel will not load, disabling" - ${SED_PATH} -i 's/^crc32c-intel/# crc32c-intel/g' /tmpRoot/usr/lib/modules-load.d/70-crypto-kernel.conf + sed -i 's/^crc32c-intel/# crc32c-intel/g' /tmpRoot/usr/lib/modules-load.d/70-crypto-kernel.conf fi - fi - # aesni-intel - if [ -f /tmpRoot/usr/lib/modules-load.d/70-crypto-kernel.conf ]; then + # aesni-intel CPUFLAGS=$(cat /proc/cpuinfo | grep flags | grep aes | wc -l) if [ ${CPUFLAGS} -gt 0 ]; then echo "CPU Supports AES, aesni-intel should load" else echo "CPU does NOT support AES, aesni-intel will not load, disabling" - ${SED_PATH} -i 's/support_aesni_intel="yes"/support_aesni_intel="no"/' /tmpRoot/etc.defaults/synoinfo.conf - ${SED_PATH} -i 's/^aesni-intel/# aesni-intel/g' /tmpRoot/usr/lib/modules-load.d/70-crypto-kernel.conf + sed -i 's/support_aesni_intel="yes"/support_aesni_intel="no"/' /tmpRoot/etc.defaults/synoinfo.conf + sed -i 's/^aesni-intel/# aesni-intel/g' /tmpRoot/usr/lib/modules-load.d/70-crypto-kernel.conf fi fi @@ -55,8 +52,8 @@ if [ "${1}" = "late" ]; then NVIDIADEV=$(cat /proc/bus/pci/devices | grep -i 10de | wc -l) if [ ${NVIDIADEV} -eq 0 ]; then echo "NVIDIA GPU is not detected, disabling " - ${SED_PATH} -i 's/^nvidia/# nvidia/g' /tmpRoot/usr/lib/modules-load.d/70-syno-nvidia-gpu.conf - ${SED_PATH} -i 's/^nvidia-uvm/# nvidia-uvm/g' /tmpRoot/usr/lib/modules-load.d/70-syno-nvidia-gpu.conf + sed -i 's/^nvidia/# nvidia/g' /tmpRoot/usr/lib/modules-load.d/70-syno-nvidia-gpu.conf + sed -i 's/^nvidia-uvm/# nvidia-uvm/g' /tmpRoot/usr/lib/modules-load.d/70-syno-nvidia-gpu.conf else echo "NVIDIA GPU is detected, nothing to do" fi @@ -71,9 +68,9 @@ if [ "${1}" = "late" ]; then fi # Network - #for I in `seq 0 7`; do - # if [ -f "/etc/sysconfig/network-scripts/ifcfg-eth${I}" ] && [ ! -f "/tmpRoot/etc.defaults/sysconfig/network-scripts/ifcfg-eth${I}" ]; then - # cp -vf "/etc/sysconfig/network-scripts/ifcfg-eth${I}" "/tmpRoot/etc.defaults/sysconfig/network-scripts/ifcfg-eth${I}" - # fi - #done -fi \ No newline at end of file + for I in $(seq 0 7); do + if [ -f "/etc/sysconfig/network-scripts/ifcfg-eth${I}" ] && [ ! -f "/tmpRoot/etc.defaults/sysconfig/network-scripts/ifcfg-eth${I}" ]; then + cp -vf "/etc/sysconfig/network-scripts/ifcfg-eth${I}" "/tmpRoot/etc.defaults/sysconfig/network-scripts/ifcfg-eth${I}" + fi + done +fi diff --git a/usbids/all/usr/sbin/usbids.sh b/usbids/all/usr/sbin/usbids.sh deleted file mode 100755 index 6119be7a..00000000 --- a/usbids/all/usr/sbin/usbids.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (C) 2023 AuxXxilium and Ing -# - -# usb.map -FILE="/usr/syno/etc.defaults/usb.map" -STATUS=$(curl -kL -w "%{http_code}" "http://www.linux-usb.org/usb.ids" -o "${FILE}.ids") -if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then - echo "usb.ids download error!" -else - [ ! -f "${FILE}.bak" ] && cp -f "${FILE}" "${FILE}.bak" - mv -f "${FILE}.ids" "${FILE}" - chmod a+rx "${FILE}" -fi -cp -f "${FILE}" "${FILE/\.defaults/}" - -exit 0 \ No newline at end of file diff --git a/usbids/install.sh b/usbids/install.sh deleted file mode 100755 index 806da13d..00000000 --- a/usbids/install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env ash - -if [ "${1}" = "late" ]; then - echo "Installing daemon for Usbids" - cp -vf /usr/sbin/usbids.sh /tmpRoot/usr/sbin/usbids.sh - [ -f "/tmpRoot/lib/systemd/system/usbids.service" ] && rm -f "/tmpRoot/lib/systemd/system/usbids.service" - DEST="/tmpRoot/lib/systemd/system/usbids.service" - echo "[Unit]" >${DEST} - echo "Description=update Add-in cards and usb.map" >>${DEST} - echo "After=multi-user.target" >>${DEST} - echo >>${DEST} - echo "[Service]" >>${DEST} - echo "Type=oneshot" >>${DEST} - echo "RemainAfterExit=true" >>${DEST} - echo "ExecStart=/usr/sbin/usbids.sh" >>${DEST} - echo >>${DEST} - echo "[Install]" >>${DEST} - echo "WantedBy=multi-user.target" >>${DEST} - - mkdir -vp /tmpRoot/lib/systemd/system/multi-user.target.wants - ln -vsf /lib/systemd/system/usbids.service /tmpRoot/lib/systemd/system/multi-user.target.wants/usbids.service -fi diff --git a/wol/all/usr/bin/wol.sh b/wol/all/usr/bin/wol.sh index d4804736..0fd96505 100755 --- a/wol/all/usr/bin/wol.sh +++ b/wol/all/usr/bin/wol.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -for N in $(ls /sys/class/net/ | grep eth); do +for N in $(ls /sys/class/net/ 2>/dev/null | grep eth); do echo "set ${N} wol g" /usr/bin/ethtool -s "${N}" wol g done \ No newline at end of file diff --git a/wol/install.sh b/wol/install.sh index 8c7db0ea..f430e313 100755 --- a/wol/install.sh +++ b/wol/install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env ash if [ "${1}" = "jrExit" ]; then - for N in $(ls /sys/class/net/ | grep eth); do + for N in $(ls /sys/class/net/ 2>/dev/null | grep eth); do /usr/bin/ethtool -s ${N} wol g 2>/dev/null done elif [ "${1}" = "late" ]; then