yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from fbelavenuto/dev

Browse Source 
little fixes
This commit is contained in:
Fabio Belavenuto 2023-01-17 10:20:28 -03:00 committed by GitHub
commit 85778bbf58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -968,7 +968,7 @@ function keymapMenu() {
KEYMAP=${resp} KEYMAP=${resp}
writeConfigKey "layout" "${LAYOUT}" "${USER_CONFIG_FILE}" writeConfigKey "layout" "${LAYOUT}" "${USER_CONFIG_FILE}"
writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}" writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
zcat /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz | loadkeys loadkeys /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz
} }
############################################################################### ###############################################################################

5
files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
View File

@ -20,10 +20,7 @@ dom: 2
dt: true dt: true
serial: serial:
prefix: prefix:
- "2030" - "2270"
- "2040"
- "20C0"
- "2150"
middle: "TQR" middle: "TQR"
suffix: "alpha" suffix: "alpha"
disks: 4 disks: 4

4
files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
View File

@ -23,8 +23,8 @@ beta: true
dom: 2 dom: 2
serial: serial:
prefix: prefix:
- "0000" - "2250"
middle: "XXX" middle: "T2R"
suffix: "alpha" suffix: "alpha"
disks: 16 disks: 16
dt: false dt: false

3
files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
View File

@ -32,6 +32,8 @@ MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`" BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`" LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`" SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
if [ ${BUILD} -ne ${buildnumber} ]; then if [ ${BUILD} -ne ${buildnumber} ]; then
echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${BUILD}\033[1;32m to \033[1;31m${buildnumber}\033[0m" echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${BUILD}\033[1;32m to \033[1;31m${buildnumber}\033[0m"
@ -147,6 +149,7 @@ echo "/addons/powersched.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${L
# User addons # User addons
for ADDON in ${!ADDONS[@]}; do for ADDON in ${!ADDONS[@]}; do
PARAMS=${ADDONS[${ADDON}]} PARAMS=${ADDONS[${ADDON}]}
[ "${ADDON}" = "console" ] && PARAMS="${LAYOUT}/${KEYMAP}"
if ! installAddon ${ADDON}; then if ! installAddon ${ADDON}; then
echo "ADDON ${ADDON} not found!" | tee -a "${LOG_FILE}" echo "ADDON ${ADDON} not found!" | tee -a "${LOG_FILE}"
exit 1 exit 1