fix w

files/initrd/opt/rr/boot.sh

@@ -247,12 +247,12 @@ else
   done
   BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
   [ -z "${BOOTWAIT}" ] && BOOTWAIT=10
-  w -h 2>/dev/null | grep -v tty1 | awk '{print $1" "$2" "$3}' >WB
+  busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
   MSG=""
   while test ${BOOTWAIT} -ge 0; do
     MSG="$(printf "\033[1;33m$(TEXT "%2ds (Changing access(ssh/web) status will interrupt boot)")\033[0m" "${BOOTWAIT}")"
     echo -en "\r${MSG}"
-    w -h 2>/dev/null | grep -v tty1 | awk '{print $1" "$2" "$3}' >WC
+    busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WC
     if ! diff WB WC >/dev/null 2>&1; then
       echo -en "\r\033[1;33m$(TEXT "access(ssh/web) status has changed and booting is interrupted.")\033[0m\n"
       rm -f WB WC
@@ -286,7 +286,7 @@ else
   fi
   kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
   echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m"
-  for T in $(w -h 2>/dev/null | awk '{print $2}'); do
+  for T in $(busybox w 2>/dev/null | grep -v 'TTY' | awk '{print $2}'); do
     [ -w "/dev/${T}" ] && echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true
   done
 
@@ -294,6 +294,6 @@ else
   rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true
 
   KERNELWAY="$(readConfigKey "kernelway" "${USER_CONFIG_FILE}")"
-  [ "${KERNELWAY}" = "kexec" ] && kexec -i -a -e || poweroff
+  [ "${KERNELWAY}" = "kexec" ] && kexec -a -e || poweroff
   exit 0
 fi

files/initrd/opt/rr/include/functions.py

@@ -42,6 +42,7 @@ def makeqr(data, file, location, output):
     """
     Generate a QRCode.
     """
+    try:
         import fcntl, struct
         import qrcode
         from PIL import Image
@@ -92,6 +93,9 @@ def makeqr(data, file, location, output):
         alpha.paste(img, loc)
         alpha.save(output)
 
+    except:
+        pass
+
 
 @cli.command()
 @click.option("-p", "--platforms", type=str, help="The platforms of Syno.")
@@ -105,8 +109,8 @@ def getmodels(platforms=None):
 
     adapter = HTTPAdapter(max_retries=Retry(total=3, backoff_factor=0.5, status_forcelist=[500, 502, 503, 504]))
     session = requests.Session()
-    session.mount('http://', adapter)
+    session.mount("http://", adapter)
-    session.mount('https://', adapter)
+    session.mount("https://", adapter)
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
     if platforms is not None and platforms != "":
@@ -142,6 +146,7 @@ def getmodels(platforms=None):
         try:
             import re
             from bs4 import BeautifulSoup
+
             # url="https://kb.synology.com/en-us/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have"
             url = "https://kb.synology.cn/zh-cn/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have"
             req = session.get(url, timeout=10, verify=False)

files/initrd/opt/rr/menu.sh

@@ -863,7 +863,9 @@ function cmdlineMenu() {
       MSG+="$(TEXT " * \Z4consoleblank=300\Zn\n    Set the console to auto turnoff display 300 seconds after no activity (measured in seconds).\n")"
       MSG+="$(TEXT "\nEnter the parameter name and value you need to add.\n")"
       LINENUM=$(($(echo -e "${MSG}" | wc -l) + 10))
+      RET=0
       while true; do
+        [ ${RET} -eq 255 ] && MSG="$(TEXT "Commonly used cmdlines:\n")"
         DIALOG --title "$(TEXT "Cmdline")" \
           --form "${MSG}" ${LINENUM:-16} 100 2 "Name:" 1 1 "" 1 10 85 0 "Value:" 2 1 "" 2 10 85 0 \
           2>"${TMP_PATH}/resp"
@@ -875,7 +877,7 @@ function cmdlineMenu() {
           if [ -z "${NAME//\"/}" ]; then
             DIALOG --title "$(TEXT "Cmdline")" \
               --yesno "$(TEXT "Invalid parameter name, retry?")" 0 0
-            [ $? -eq 0 ] && break
+            [ $? -eq 0 ] && continue || break
           fi
           writeConfigKey "cmdline.\"${NAME//\"/}\"" "${VALUE}" "${USER_CONFIG_FILE}"
           break
@@ -884,7 +886,7 @@ function cmdlineMenu() {
           break
           ;;
         255) # ESC
-          break
+          # break
           ;;
         esac
       done
@@ -935,7 +937,7 @@ function cmdlineMenu() {
           if [ -z "${sn}" -o -z "${mac1}" ]; then
             DIALOG --title "$(TEXT "Cmdline")" \
               --yesno "$(TEXT "Invalid SN/MAC, retry?")" 0 0
-            [ $? -eq 0 ] && break
+            [ $? -eq 0 ] && continue || break
           fi
           SN="${sn}"
           writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
@@ -997,7 +999,9 @@ function synoinfoMenu() {
       MSG+="$(TEXT " * \Z4max_sys_raid_disks=12\Zn\n    Maximum number of system partition(md0) raid disks.\n")"
       MSG+="$(TEXT "\nEnter the parameter name and value you need to add.\n")"
       LINENUM=$(($(echo -e "${MSG}" | wc -l) + 10))
+      RET=0
       while true; do
+        [ ${RET} -eq 255 ] && MSG="$(TEXT "Commonly used synoinfo:\n")"
         DIALOG --title "$(TEXT "Synoinfo")" \
           --form "${MSG}" ${LINENUM:-16} 100 2 "Name:" 1 1 "" 1 10 85 0 "Value:" 2 1 "" 2 10 85 0 \
           2>"${TMP_PATH}/resp"
@@ -1009,7 +1013,7 @@ function synoinfoMenu() {
           if [ -z "${NAME//\"/}" ]; then
             DIALOG --title "$(TEXT "Synoinfo")" \
               --yesno "$(TEXT "Invalid parameter name, retry?")" 0 0
-            [ $? -eq 0 ] && break
+            [ $? -eq 0 ] && continue || break
           fi
           writeConfigKey "synoinfo.\"${NAME//\"/}\"" "${VALUE}" "${USER_CONFIG_FILE}"
           touch ${PART1_PATH}/.build
@@ -1019,7 +1023,7 @@ function synoinfoMenu() {
           break
           ;;
         255) # ESC
-          break
+          # break
           ;;
         esac
       done
@@ -1552,7 +1556,7 @@ function setWirelessAccount() {
       if [ -z "${SSID}" -o -z "${PSK}" ]; then
         DIALOG --title "$(TEXT "Advanced")" \
           --yesno "$(TEXT "Invalid SSID/PSK, retry?")" 0 0
-        [ $? -eq 0 ] && break
+        [ $? -eq 0 ] && continue || break
       fi
       (
         rm -f ${PART1_PATH}/wpa_supplicant.conf
@@ -1924,7 +1928,7 @@ function addNewDSMUser() {
   (
     ONBOOTUP=""
     ONBOOTUP="${ONBOOTUP}if synouser --enum local | grep -q ^${username}\$; then synouser --setpw ${username} ${password}; else synouser --add ${username} ${password} rr 0 user@rr.com 1; fi\n"
-    ONBOOTUP="${ONBOOTUP}synogroup --member administrators ${username}\n"
+    ONBOOTUP="${ONBOOTUP}synogroup --memberadd administrators ${username}\n"
     ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''RRONBOOTUPRR_ADDUSER'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
 
     mkdir -p "${TMP_PATH}/mdX"
@@ -2860,8 +2864,10 @@ function updateRR() {
       mkdir -p "${TMP_PATH}/update/$(dirname "${VALUE}")"
       mv -f "${TMP_PATH}/update/$(basename "${KEY}")" "${TMP_PATH}/update/${VALUE}"
     fi
-    SIZENEW=$((${SIZENEW} + $(du -sm "${TMP_PATH}/update/${VALUE}" 2>/dev/null | awk '{print $1}')))
+    FSNEW=$(du -sm "${TMP_PATH}/update/${VALUE}" 2>/dev/null | awk '{print $1}')
-    SIZEOLD=$((${SIZEOLD} + $(du -sm "${VALUE}" 2>/dev/null | awk '{print $1}')))
+    FSOLD=$(du -sm "${VALUE}" 2>/dev/null | awk '{print $1}')
+    SIZENEW=$((${SIZENEW} + ${FSNEW:-0}))
+    SIZEOLD=$((${SIZEOLD} + ${FSOLD:-0}))
   done <<<$(readConfigMap "replace" "${TMP_PATH}/update/update-list.yml")
 
   SIZESPL=$(df -m ${PART3_PATH} 2>/dev/null | awk 'NR==2 {print $4}')