files/initrd/opt/rr/boot.sh

@@ -201,11 +201,11 @@ else
     COUNT=$((${COUNT} + 1))
     echo -n "."
     sleep 1
+    /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
   done
   echo "$(TEXT "Waiting IP.")"
   for N in ${ETHX}; do
     COUNT=0
-    /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
     DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
     echo -en "${N}(${DRIVER}): "
     while true; do

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

@@ -343,10 +343,10 @@ function getLogo() {
 # 1 - mode
 function rebootTo() {
   MODES="config recovery junior"
-  if [ -z "${1}" ] || ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
+  [ -z "${1}" ] && exit 1
+  if ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
   # echo "Rebooting to ${1} mode"
   GRUBPATH="$(dirname $(find ${PART1_PATH}/ -name grub.cfg 2>/dev/null | head -1))"
-  [ -z "${GRUBPATH}" ] && exit 1
   ENVFILE="${GRUBPATH}/grubenv"
   [ ! -f "${ENVFILE}" ] && grub-editenv ${ENVFILE} create
   grub-editenv ${ENVFILE} set next_entry="${1}"

files/initrd/opt/rr/init.sh

@@ -146,11 +146,11 @@ while [ ${COUNT} -lt 30 ]; do
   COUNT=$((${COUNT} + 1))
   echo -n "."
   sleep 1
+  /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
 done
 echo "$(TEXT "Waiting IP.")"
 for N in ${ETHX}; do
   COUNT=0
-  /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
   DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
   echo -en "${N}(${DRIVER}): "
   while true; do

files/initrd/opt/rr/menu.sh

@@ -1102,7 +1102,6 @@ function getSynoExtractor() {
   if [ $? -ne 0 ]; then
     rm -f "${OLDPAT_PATH}"
     rm -rf "${RAMDISK_PATH}"
-    echo -e "$(TEXT "pat Invalid, try again!")" >"${LOG_FILE}"
     return 1
   fi
   rm -f "${OLDPAT_PATH}"
@@ -1152,7 +1151,6 @@ function extractPatFiles() {
   mkdir -p "${EXT_PATH}"
   echo -n "$(printf "$(TEXT "Disassembling %s: ")" "$(basename "${PAT_PATH}")")"
 
-  RET=0
   if [ "${isencrypted}" = "yes" ]; then
     EXTRACTOR_PATH="${PART3_PATH}/extractor"
     EXTRACTOR_BIN="syno_extract_system_patch"
@@ -1166,19 +1164,22 @@ function extractPatFiles() {
     # Uses the extractor to untar pat file
     echo "$(TEXT "Extracting ...")"
     LD_LIBRARY_PATH=${EXTRACTOR_PATH} "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_PATH}" "${EXT_PATH}" >"${LOG_FILE}" 2>&1
-    RET=$?
+    if [ $? -ne 0 ]; then
+      return 1
+    fi
   else
     echo "$(TEXT "Extracting ...")"
     tar -xf "${PAT_PATH}" -C "${EXT_PATH}" >"${LOG_FILE}" 2>&1
-    RET=$?
+    if [ $? -ne 0 ]; then
+      return 1
+    fi
   fi
 
-  if [ ${RET} -ne 0 ] ||
+  if [ ! -f ${EXT_PATH}/grub_cksum.syno ] ||
-    [ ! -f ${EXT_PATH}/grub_cksum.syno ] ||
     [ ! -f ${EXT_PATH}/GRUB_VER ] ||
     [ ! -f ${EXT_PATH}/zImage ] ||
     [ ! -f ${EXT_PATH}/rd.gz ]; then
-    echo -e "$(TEXT "pat Invalid, try again!")\nError: ${RET}" >"${LOG_FILE}"
+    echo -e "$(TEXT "pat Invalid, try again!")" >"${LOG_FILE}"
     return 1
   fi
   rm -f "${LOG_FILE}"
@@ -1693,7 +1694,7 @@ function formatDisks() {
     [ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
     [ -z "${ID}" ] && ID="Unknown"
     echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
-  done <<<$(lsblk -pno KNAME,ID,PKNAME | sort)
+  done <<<$(lsblk -pno KNAME,ID,PKNAME)
   if [ ! -f "${TMP_PATH}/opts" ]; then
     DIALOG --title "$(TEXT "Advanced")" \
       --msgbox "$(TEXT "No disk found!")" 0 0
@@ -2133,7 +2134,7 @@ function cloneBootloaderDisk() {
     [ -z "${KNAME}" -o -z "${ID}" ] && continue
     [ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
     echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
-  done <<<$(lsblk -dpno KNAME,ID,PKNAME | sort)
+  done <<<$(lsblk -dpno KNAME,ID,PKNAME)
   if [ ! -f "${TMP_PATH}/opts" ]; then
     DIALOG --title "$(TEXT "Advanced")" \
       --msgbox "$(TEXT "No disk found!")" 0 0