From ef56eaa4ef79eef983b2cd680f211a52791bb756 Mon Sep 17 00:00:00 2001
From: spycat88 <spycat88@users.noreply.github.com>
Date: Tue, 2 Apr 2024 01:06:28 +0100
Subject: [PATCH] fs-resize: update script from upstream

---
 packages/sysutils/busybox/scripts/fs-resize | 76 ++++++++++++---------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/fs-resize b/packages/sysutils/busybox/scripts/fs-resize
index e56c86190..a6d6b4c3b 100755
--- a/packages/sysutils/busybox/scripts/fs-resize
+++ b/packages/sysutils/busybox/scripts/fs-resize
@@ -2,62 +2,70 @@
 
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
-# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+StartProgressLog() {
+  if [ "$1" = "spinner" ]; then
+    echo "*** $3" >>$LOG
+  fi
+  StartProgress "$@"
+}
 
 if [ -e /storage/.please_resize_me ] ; then
   . /usr/lib/rocknix/functions
 
   hidecursor
 
+  mount -o remount,rw /flash
+  LOG=/flash/fs-resize.log
+  date -Iseconds >>$LOG
+
   # this sh** was never intended to be used
   # on already installed and runing system
-  if [ -d /storage/.kodi -o -d /storage/.config -o -d /storage/.cache ] ; then
+  if [ -d /storage/.config -o -d /storage/.cache ] ; then
     rm -f /storage/.please_resize_me
     sync
-    echo "Resizing is not permitted - the system has already been initialised."
-    StartProgress countdown "Rebooting in 15s... " 15 "NOW"
-    reboot
+    echo "Resizing is not permitted - the system has already been initialised." | tee -a $LOG
+    mount -o remount,ro /flash
+    StartProgress countdown "Rebooting in 5s... " 5 "NOW"
+    reboot -f
   fi
 
   # get the disk. /storage on 2nd partition
-  PART=$(blkid | awk 'BEGIN {FS=":"} /'$(cat /proc/cmdline | sed -e 's#^.*disk=UUID=##g' -e 's#\ .*$##g')'/ {print $1}')
-  if [ "$(echo ${PART} | awk '/mmcblk/ || /nvme/ {print $1}')" ]
-  then
-    DISK=$(echo ${PART} | sed s/p[0-9]//g)
-    PARTNUM=$(echo ${PART} | sed "s#^.*[0-9]p##g")
-  else
-    DISK=$(echo ${PART} | sed s/[0-9]//g)
-    PARTNUM=$(echo ${PART} | sed "s#^.*sd[a-z]##g")
-  fi
+  echo $(grep "/storage " /proc/mounts) >>$LOG
+  PART=$(grep "/storage " /proc/mounts | cut -d" " -f1 | grep '2$')
+
+  # get disk: /dev/sdx2 -> /dev/sdx, /dev/mmcblkxp2 -> /dev/mmcblkx
+  case $PART in
+    "/dev/mmcblk"*|"/dev/nvme"*)
+      DISK=$(echo $PART | sed s/p2$//g)
+      ;;
+    *)
+      DISK=$(echo $PART | sed s/2$//g)
+      ;;
+  esac
+
   rm -f /storage/.please_resize_me
   sync
 
-  # just in case
-  if [ ! -z "${DISK}" -a ! -z "${PART}" ] ; then
-    umount ${PART}
+  echo "DISK: $DISK  PART: $PART" >>$LOG
+
+  # just in case
+  if [ ! -z "$DISK" -a ! -z "$PART" ] ; then
+    umount $PART
 
-    clear >/dev/console
     echo "PARTITION RESIZING IN PROGRESS"
     echo ""
     echo "Please do not reboot or turn off your @DISTRONAME@ device!"
     echo ""
 
-    # identify the partition scheme, and if gpt fix minor issues such as gpt header not at end of disk
-    SCHEME=$(blkid -s PTTYPE -o value ${DISK})
-    if [ "$SCHEME" = "gpt" ]; then
-      StartProgress spinner "Checking layout...      " "parted -fs ${DISK} print &>/dev/null"
-    fi
-
-    StartProgress spinner "Resizing storage partition...   " "parted -s -a optimal -m ${DISK} resizepart ${PARTNUM} 100% &>/dev/null"
-    StartProgress spinner "Checking storage file system... " "e2fsck -f -p ${PART} &>/dev/null"
-    StartProgress spinner "Resizing storage file system... " "resize2fs ${PART} &>/dev/null"
-    StartProgress spinner "Checking storage file system... " "e2fsck -f -p ${PART} &>/dev/null"
-
+    StartProgressLog spinner "Resizing partition...   " "parted -s -f -m $DISK resizepart 2 100% >>$LOG 2>&1"
+    StartProgressLog spinner "Checking file system... " "e2fsck -f -p $PART >>$LOG 2>&1"
+    StartProgressLog spinner "Resizing file system... " "resize2fs $PART >>$LOG 2>&1"
     StartProgress countdown "Rebooting in 5s...     " 5 "NOW"
+  else
+    echo "Partition was not detected - resizing aborted."
+    StartProgress countdown "Rebooting in 5s... " 5 "NOW"
   fi
+  mount -o remount,ro /flash
 fi
-sync &>/dev/null
-sync &>/dev/null
-sync &>/dev/null
-reboot &>/dev/null
+reboot -f &>/dev/null