From 1798615a9017b4db47c650c5d92fc525a390a93e Mon Sep 17 00:00:00 2001
From: Fabio Belavenuto <belavenuto@gmail.com>
Date: Tue, 17 Jan 2023 10:20:08 -0300
Subject: [PATCH] little fixes

---
 files/board/arpl/overlayfs/opt/arpl/menu.sh                  | 2 +-
 files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml | 5 +----
 .../arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml      | 4 ++--
 files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh         | 3 +++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
index 19abb2fb..b7bb433e 100755
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -968,7 +968,7 @@ function keymapMenu() {
   KEYMAP=${resp}
   writeConfigKey "layout" "${LAYOUT}" "${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
 }
 
 ###############################################################################
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
index b9c20b01..1f0d1713 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml
@@ -20,10 +20,7 @@ dom: 2
 dt: true
 serial:
   prefix:
-    - "2030"
-    - "2040"
-    - "20C0"
-    - "2150"
+    - "2270"
   middle: "TQR"
   suffix: "alpha"
 disks: 4
diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
index 828442b5..a31deace 100644
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml
@@ -23,8 +23,8 @@ beta: true
 dom: 2
 serial:
   prefix:
-    - "0000"
-  middle: "XXX"
+    - "2250"
+  middle: "T2R"
   suffix: "alpha"
 disks: 16
 dt: false
diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
index 6e350d84..eaf84c3e 100755
--- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
@@ -32,6 +32,8 @@ MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
 BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 LKM="`readConfigKey "lkm" "${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
   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
 for ADDON in ${!ADDONS[@]}; do
   PARAMS=${ADDONS[${ADDON}]}
+  [ "${ADDON}" = "console" ] && PARAMS="${LAYOUT}/${KEYMAP}"
   if ! installAddon ${ADDON}; then
     echo "ADDON ${ADDON} not found!" | tee -a "${LOG_FILE}"
     exit 1