fix cloneBootloaderDisk

files/initrd/opt/rr/menu.sh

@@ -498,6 +498,9 @@ function ParsePat() {
     rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" >/dev/null 2>&1 || true
     rm -f "${PART1_PATH}/grub_cksum.syno" "${PART1_PATH}/GRUB_VER" "${PART2_PATH}/"* >/dev/null 2>&1 || true
     touch ${PART1_PATH}/.build
+    rm -f "${LOG_FILE}"
+    echo "$(TEXT "Ready!")"
+    sleep 3
     break
   done 2>&1 | DIALOG --title "$(TEXT "Main menu")" \
     --progressbox "$(TEXT "Making ...")" 20 100
@@ -1160,6 +1163,9 @@ 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
+    if [ $? -ne 0 ]; then
+      return 1
+    fi
   else
     echo "$(TEXT "Extracting ...")"
     tar -xf "${PAT_PATH}" -C "${EXT_PATH}" >"${LOG_FILE}" 2>&1
@@ -1175,6 +1181,8 @@ function extractPatFiles() {
     echo -e "$(TEXT "pat Invalid, try again!")" >"${LOG_FILE}"
     return 1
   fi
+  rm -f "${LOG_FILE}"
+  return 0
 }
 
 ###############################################################################
@@ -2153,37 +2161,93 @@ function cloneBootloaderDisk() {
     [ $? -ne 0 ] && return
   fi
   (
+    rm -f "${LOG_FILE}"
     rm -rf "${PART3_PATH}/dl"
     CLEARCACHE=0
 
     gzip -dc "${WORK_PATH}/grub.img.gz" | dd of="${RESP}" bs=1M conv=fsync status=progress
     hdparm -z "${RESP}" # reset disk cache
     fdisk -l "${RESP}"
-    sleep 3
+    sleep 1
 
+    NEW_BLDISK_P1="$(lsblk "${RESP}" -pno KNAME,LABEL 2>/dev/null | grep 'RR1' | awk '{print $1}')"
+    NEW_BLDISK_P2="$(lsblk "${RESP}" -pno KNAME,LABEL 2>/dev/null | grep 'RR2' | awk '{print $1}')"
+    NEW_BLDISK_P3="$(lsblk "${RESP}" -pno KNAME,LABEL 2>/dev/null | grep 'RR3' | awk '{print $1}')"
+    SIZEOFDISK=$(cat /sys/block/${RESP/\/dev\//}/size)
+    ENDSECTOR=$(($(fdisk -l ${RESP} | grep "${NEW_BLDISK_P3}" | awk '{print $3}') + 1))
+    if [ ${SIZEOFDISK}0 -ne ${ENDSECTOR}0 ]; then
+      echo -e "\033[1;36mResizing ${NEW_BLDISK_P3}\033[0m"
+      echo -e "d\n\nn\n\n\n\n\nn\nw" | fdisk "${RESP}" >/dev/null 2>&1
+      resize2fs "${NEW_BLDISK_P3}"
+      fdisk -l "${RESP}"
+      sleep 1
+    fi
+    function __umountNewBlDisk() {
+      umount "${TMP_PATH}/sdX1" 2>/dev/null
+      umount "${TMP_PATH}/sdX2" 2>/dev/null
+      umount "${TMP_PATH}/sdX3" 2>/dev/null
+    }
     mkdir -p "${TMP_PATH}/sdX1"
-    mount "$(lsblk "${RESP}" -pno KNAME,LABEL 2>/dev/null | grep RR1 | awk '{print $1}')" "${TMP_PATH}/sdX1"
-    cp -vRf "${PART1_PATH}/". "${TMP_PATH}/sdX1/"
-    sync
-    umount "${TMP_PATH}/sdX1"
-
     mkdir -p "${TMP_PATH}/sdX2"
-    mount "$(lsblk "${RESP}" -pno KNAME,LABEL 2>/dev/null | grep RR2 | awk '{print $1}')" "${TMP_PATH}/sdX2"
-    cp -vRf "${PART2_PATH}/". "${TMP_PATH}/sdX2/"
-    sync
-    umount "${TMP_PATH}/sdX2"
-
     mkdir -p "${TMP_PATH}/sdX3"
-    mount "$(lsblk "${RESP}" -pno KNAME,LABEL 2>/dev/null | grep RR3 | awk '{print $1}')" "${TMP_PATH}/sdX3"
+    mount "${NEW_BLDISK_P1}" "${TMP_PATH}/sdX1" || (
-    cp -vRf "${PART3_PATH}/". "${TMP_PATH}/sdX3/"
+      echo "$(printf "$(TEXT "Can't mount %s.")" "${NEW_BLDISK_P1}")" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    )
+    mount "${NEW_BLDISK_P2}" "${TMP_PATH}/sdX2" || (
+      echo "$(printf "$(TEXT "Can't mount %s.")" "${NEW_BLDISK_P2}")" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    )
+    mount "${NEW_BLDISK_P3}" "${TMP_PATH}/sdX3" || (
+      echo "$(printf "$(TEXT "Can't mount %s.")" "${NEW_BLDISK_P3}")" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    )
+
+    SIZEOLD1="$(du -sm "${PART1_PATH}" 2>/dev/null | awk '{print $1}')"
+    SIZEOLD2="$(du -sm "${PART2_PATH}" 2>/dev/null | awk '{print $1}')"
+    SIZEOLD3="$(du -sm "${PART3_PATH}" 2>/dev/null | awk '{print $1}')"
+    SIZENEW1="$(df -m "${NEW_BLDISK_P1}" 2>/dev/null | awk 'NR==2 {print $4}')"
+    SIZENEW2="$(df -m "${NEW_BLDISK_P2}" 2>/dev/null | awk 'NR==2 {print $4}')"
+    SIZENEW3="$(df -m "${NEW_BLDISK_P3}" 2>/dev/null | awk 'NR==2 {print $4}')"
+
+    if [ ${SIZEOLD1:-0} -ge ${SIZENEW1:-0} ] || [ ${SIZEOLD2:-0} -ge ${SIZENEW2:-0} ] || [ ${SIZEOLD3:-0} -ge ${SIZENEW3:-0} ]; then
+      MSG="$(TEXT "Cloning failed due to insufficient remaining disk space on the selected hard drive.")"
+      echo "${MSG}" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    fi
+
+    cp -vRf "${PART1_PATH}/". "${TMP_PATH}/sdX1/" || (
+      echo "$(printf "$(TEXT "Can't copy to %s.")" "${NEW_BLDISK_P1}")" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    )
+    cp -vRf "${PART2_PATH}/". "${TMP_PATH}/sdX2/" || (
+      echo "$(printf "$(TEXT "Can't copy to %s.")" "${NEW_BLDISK_P2}")" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    )
+    cp -vRf "${PART3_PATH}/". "${TMP_PATH}/sdX3/" || (
+      echo "$(printf "$(TEXT "Can't copy to %s.")" "${NEW_BLDISK_P3}")" >"${LOG_FILE}"
+      __umountNewBlDisk
+      break
+    )
     sync
-    umount "${TMP_PATH}/sdX3"
+    __umountNewBlDisk
     sleep 3
   ) 2>&1 | DIALOG --title "$(TEXT "Advanced")" \
     --progressbox "$(TEXT "Cloning ...")" 20 100
-  DIALOG --title "${T}" \
+  if [ -f "${LOG_FILE}" ]; then
-    --msgbox "$(printf "$(TEXT "Bootloader has been cloned to disk %s, please remove the current bootloader disk!\nReboot?")" "${RESP}")" 0 0
+    DIALOG --title "$(TEXT "Advanced")" \
-  rebootTo config
+      --msgbox "$(cat ${LOG_FILE})" 0 0
+  else
+    DIALOG --title "$(TEXT "Advanced")" \
+      --msgbox "$(printf "$(TEXT "Bootloader has been cloned to disk %s, please remove the current bootloader disk!\nReboot?")" "${RESP}")" 0 0
+    rebootTo config
+  fi
   return
 }
 

files/initrd/opt/rr/patch/modulelist

@@ -12,6 +12,12 @@ N kvm-intel.ko
 N kvm-amd.ko
 N kvm.ko
 
+# sensors
+N coretemp.ko
+N k10temp.ko
+N it87.ko
+N adt7475.ko
+
 # rndis
 F mii.ko
 F cdc_ether.ko