From 671a358b65b73129491f976b04511fa8416dde74 Mon Sep 17 00:00:00 2001 From: mglae Date: Sun, 4 Jun 2023 12:17:09 +0200 Subject: [PATCH] busybox: fs-resize: use parted to fix gpt errors instead of sgdisk parted's 6.3 "--fix" parameter now allows non-interactive fixing gptfdisk package dependency is removed --- packages/sysutils/busybox/package.mk | 2 +- packages/sysutils/busybox/scripts/fs-resize | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 7cf5de6e5f..6512b146cd 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="https://busybox.net/downloads/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain hdparm dosfstools e2fsprogs zip usbutils parted procps-ng gptfdisk libtirpc" +PKG_DEPENDS_TARGET="toolchain hdparm dosfstools e2fsprogs zip usbutils parted procps-ng libtirpc" PKG_DEPENDS_INIT="toolchain libtirpc" PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable." PKG_BUILD_FLAGS="-parallel" diff --git a/packages/sysutils/busybox/scripts/fs-resize b/packages/sysutils/busybox/scripts/fs-resize index 69dfb1a999..a6f4f914a3 100755 --- a/packages/sysutils/busybox/scripts/fs-resize +++ b/packages/sysutils/busybox/scripts/fs-resize @@ -58,13 +58,7 @@ if [ -e /storage/.please_resize_me ] ; then 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 - StartProgressLog spinner "Checking layout... " "sgdisk -e $DISK >>$LOG 2>&1" - fi - - StartProgressLog spinner "Resizing partition... " "parted -s -m $DISK resizepart 2 100% >>$LOG 2>&1" + 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 15s... " 15 "NOW"