From 2be09187dc5a8f5b52aef06a1077ac450aa9c92b Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Tue, 23 Oct 2018 18:50:57 +0200
Subject: [PATCH 1/3] fs-resize: simplify using parted's 3.2 'resizepart'

---
 packages/sysutils/busybox/scripts/fs-resize | 36 ++++++++-------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/fs-resize b/packages/sysutils/busybox/scripts/fs-resize
index cb72661fdd..6be1d3e6ef 100755
--- a/packages/sysutils/busybox/scripts/fs-resize
+++ b/packages/sysutils/busybox/scripts/fs-resize
@@ -36,31 +36,23 @@ if [ -e /storage/.please_resize_me ] ; then
 
   # just in case
   if [ ! -z "$DISK" -a ! -z "$PART" ] ; then
-    # get storage partition start
-    PART_START=$(parted -s -m $DISK unit b print 2>/dev/null | grep -v ^/dev | grep -v BYT | grep ^2: |  cut -f2 -d ":")
+    umount $PART
 
-    # failed to get partition start offset ?
-    if [ ! -z "$PART_START" ] ; then
-      umount $PART
+    echo "PARTITION RESIZING IN PROGRESS"
+    echo ""
+    echo "Please do not reboot or turn off your @DISTRONAME@ device!"
+    echo ""
 
-      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...   " "sgdisk -e $DISK &>/dev/null"
-      fi
-
-      StartProgress spinner "Deleting /storage... " "parted -s -m $DISK rm 2 &>/dev/null"
-      StartProgress spinner "Creating /storage... " "parted -s -m $DISK unit b mkpart primary $PART_START 100% &>/dev/null"
-      StartProgress spinner "Checking /storage... " "e2fsck -f -p $PART &>/dev/null"
-      StartProgress spinner "Resizing /storage... " "resize2fs $PART &>/dev/null"
-
-      StartProgress countdown "Rebooting in 15s... " 15 "NOW"
+    # 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...      " "sgdisk -e $DISK &>/dev/null"
     fi
+
+    StartProgress spinner "Resizing partition...   " "parted -s -m $DISK resizepart 2 100% &>/dev/null"
+    StartProgress spinner "Checking file system... " "e2fsck -f -p $PART &>/dev/null"
+    StartProgress spinner "Resizing file system... " "resize2fs $PART &>/dev/null"
+    StartProgress countdown "Rebooting in 15s...     " 15 "NOW"
   fi
 fi
 reboot -f &>/dev/null

From 3d5457202ddbf76bdfed823597824413b6b40d03 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Tue, 23 Oct 2018 18:50:57 +0200
Subject: [PATCH 2/3] util-linux: bump 2.32.1 (non blocking uuid_generate())

---
 packages/sysutils/util-linux/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index a748306503..07e07e8ea7 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -3,10 +3,10 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.31"
-PKG_SHA256="f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a"
+PKG_VERSION="2.32.1"
+PKG_SHA256="86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2"
 PKG_LICENSE="GPL"
-PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%-*}/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"

From 7c9ba8e7dc475af3122ad374c6fb794260340e97 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Tue, 23 Oct 2018 18:50:57 +0200
Subject: [PATCH 3/3] gptfdisk: bump 1.0.4

---
 packages/sysutils/gptfdisk/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/sysutils/gptfdisk/package.mk b/packages/sysutils/gptfdisk/package.mk
index 3b1fbf686e..2668ea675a 100644
--- a/packages/sysutils/gptfdisk/package.mk
+++ b/packages/sysutils/gptfdisk/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gptfdisk"
-PKG_VERSION="1.0.1"
-PKG_SHA256="864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7"
+PKG_VERSION="1.0.4"
+PKG_SHA256="b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.rodsbooks.com/gdisk/"
 PKG_URL="https://downloads.sourceforge.net/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"