update 2025-05-15 14:58:55

VERSION

@@ -1 +1 @@
-25.5.5
+25.5.6

files/initrd/opt/rr/boot.sh

@@ -234,6 +234,11 @@ CMDLINE['nowatchdog']=""
 CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
 CMDLINE['mev']="${MEV:-physical}"
 
+if [ "${MEV:-physical}" = "vmware" ]; then
+  CMDLINE['tsc']="reliable"
+  CMDLINE['pmtmr']="0x0"
+fi
+
 if [ "${HDDSORT}" = "true" ]; then
   CMDLINE['hddsort']=""
 fi

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

@@ -8,7 +8,7 @@
 
 # shellcheck disable=SC2034
 
-RR_VERSION="25.5.5"
+RR_VERSION="25.5.6"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

files/initrd/opt/rr/init.sh

@@ -12,6 +12,12 @@ set -e
 . "${WORK_PATH}/include/functions.sh"
 . "${WORK_PATH}/include/addons.sh"
 
+if type -p vmware-toolbox-cmd; then
+  if [ ! "Enabled" = "$(vmware-toolbox-cmd timesync status 2>/dev/null)" ]; then
+    vmware-toolbox-cmd timesync enable >/dev/null 2>&1 || true
+  fi
+fi
+
 [ -z "${LOADER_DISK}" ] && die "$(TEXT "Loader is not init!")"
 checkBootLoader || die "$(TEXT "The loader is corrupted, please rewrite it!")"
 

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.5.5
+25.5.6

localbuild.sh

@@ -39,7 +39,7 @@ function create() {
   sudo apt install -y locales busybox dialog gettext sed gawk jq curl
   sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils dosfstools cpio xz-utils lz4 lzma bzip2 gzip zstd
   # sudo snap install yq
-  if ! type yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then
+  if ! type yq >/dev/null 2>&1 || ! yq --version 2>/dev/null | grep -q "v4."; then
     sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq
   fi
 
@@ -239,11 +239,12 @@ function resize() {
 
   sudo truncate -s ${SIZE}M "${OUTPUT_FILE}"
   echo -e "d\n\nn\n\n\n\n\nn\nw" | sudo fdisk "${OUTPUT_FILE}" >/dev/null 2>&1
-  local LOOPX
+  local LOOPX LOOPXPY
   LOOPX=$(sudo losetup -f)
   sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
-  sudo e2fsck -fp "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
-  sudo resize2fs "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
+  LOOPXPY="$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
+  sudo e2fsck -fp "${LOOPXPY:-${LOOPX}p3}"
+  sudo resize2fs "${LOOPXPY:-${LOOPX}p3}"
   sudo losetup -d "${LOOPX}"
 }
 

scripts/func.sh

@@ -314,11 +314,12 @@ function resizeImg() {
 
   sudo truncate -s ${SIZE}M "${OUTPUT_FILE}"
   echo -e "d\n\nn\n\n\n\n\nn\nw" | sudo fdisk "${OUTPUT_FILE}" >/dev/null 2>&1
-  local LOOPX
+  local LOOPX LOOPXPY
   LOOPX=$(sudo losetup -f)
   sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
-  sudo e2fsck -fp "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
-  sudo resize2fs "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
+  LOOPXPY="$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
+  sudo e2fsck -fp "${LOOPXPY:-${LOOPX}p3}"
+  sudo resize2fs "${LOOPXPY:-${LOOPX}p3}"
   sudo losetup -d "${LOOPX}"
 }
 
@@ -329,7 +330,7 @@ function createvmx() {
   local BLIMAGE=${1}
   local VMNAME=${2}
 
-  if ! type qemu-img &>/dev/null; then
+  if ! type qemu-img >/dev/null 2>&1; then
     sudo apt install -y qemu-utils
   fi
 

sourcebuild.sh

@@ -9,7 +9,7 @@
 # sudo apt install -y locales busybox dialog gettext sed gawk jq curl
 # sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils dosfstools cpio xz-utils lz4 lzma bzip2 gzip zstd
 # # sudo snap install yq
-# if ! type yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then
+# if ! type yq >/dev/null 2>&1 || ! yq --version 2>/dev/null | grep -q "v4."; then
 #   sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq
 # fi
 #