Merge ~xnox/initramfs-tools-ubuntu-core/+git/initramfs-tools-devices:master into ~ubuntu-core-dev/initramfs-tools-ubuntu-core/+git/initramfs-tools-devices:master

[Dimitri John Ledkov]

Port to sfdisk, to safe 1.2M uncompressed space due to dropping libstdc++ from the initramfs.

Also, I'm not sure this should exists at all in favor of using systemd.mount fstab x-systemd.growfs option or by starting a <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index ca22009..edbba33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+initramfs-tools-devices (0.4) eoan; urgency=medium
+
+  * Port from parted/sgdisk to sfdisk. Also I'm not sure this should at
+    all exist, in favor of using systemd's .mount unit expand option.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 17 May 2019 18:22:41 +0100
+
 initramfs-tools-devices (0.3) disco; urgency=medium
 
   * Add some missing binaries to the initramfs
diff --git a/debian/control b/debian/control
index 6ace4db..76516b9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 4.1.4
 
 Package: initramfs-tools-devices
 Architecture: all
-Depends: initramfs-tools, ${misc:Depends}, parted, gdisk
+Depends: initramfs-tools, ${misc:Depends}
 Description: Common initramfs scripts for Ubuntu Core and Classic
  This package contains initramfs scripts that can be useful for both
  Ubuntu Core and Classic systems, like the resize script, which resizes
diff --git a/hooks/resize b/hooks/resize
index 885aa52..b8a6744 100755
--- a/hooks/resize
+++ b/hooks/resize
@@ -21,9 +21,9 @@ esac
 
 copy_exec /sbin/e2fsck /sbin
 copy_exec /sbin/findfs /sbin
-copy_exec /sbin/parted /sbin
-copy_exec /sbin/sgdisk /sbin
+copy_exec /sbin/sfdisk /sbin
 copy_exec /sbin/resize2fs /sbin
 copy_exec /sbin/blockdev /sbin
+# possibly build the below into busybox
 copy_exec /usr/bin/realpath
 copy_exec /usr/bin/dirname
diff --git a/resize.patch b/resize.patch
deleted file mode 100644
index 6e26d5a..0000000
--- a/resize.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- resize	2018-08-15 09:42:40.000000000 +0100
-+++ resize-new	2018-08-15 08:41:22.647748986 +0100
-@@ -38,7 +38,6 @@
- device_size="$(($(cat "$syspath"/size)/2))"
- sum_size="$(($(grep "$(basename "$device")[a-z0-9]" /proc/partitions|\
-     tr -s ' '|cut -d' ' -f4|tr '\n' '+'|sed 's/+$//')))"
--w_size="$(dumpe2fs -h "$writable_part" 2>&1 | awk -F: '/Block count/{count=$2} /Block size/{size=$2} END{print count*size/1024}')"
- 
- get_end()
- {
-@@ -92,7 +91,6 @@
- 
- free_space=$((device_size-sum_size))
- min_free_space=$((device_size/10))
--free_w_space=$((device_size-w_size))
- 
- # this should never be empty, else argument checking of resize2fs 
- # will recognize it as empty string (due to the quoting of the arg below) and fail
-@@ -125,13 +123,5 @@
-     # check the filesystem before attempting re-size
-     e2fsck -fy "$writable_part" >>$LOGFILE 2>&1
-     # resize the filesystem to full size of the partition
--    resize2fs "$resizeopts" "$writable_part" >>$LOGFILE 2>&1
--
--# check if we need to resize ext4 file system only
--elif [ "$min_free_space" -lt "$free_w_space" ]; then
--    echo "resizing fs in ${writable_part} part" >>$LOGFILE 2>&1
--    # check the filesystem before attempting re-size
--    e2fsck -fy "$writable_part" >>$LOGFILE 2>&1
--    # resize the filesystem to full size of the partition
-     resize2fs "$resizeopts" "$writable_part" >>$LOGFILE 2>&1
- fi
diff --git a/scripts/local-premount/resize b/scripts/local-premount/resize
index 5aabb7f..7ce2759 100755
--- a/scripts/local-premount/resize
+++ b/scripts/local-premount/resize
@@ -16,7 +16,6 @@ case "$1" in
         ;;
 esac
 
-TMPFILE="/run/initramfs/old-table.txt"
 LOGFILE="/run/initramfs/resize-writable.log"
 
 wait-for-root "LABEL=writable" "${ROOTDELAY:-180}" >/dev/null || true
@@ -39,56 +38,6 @@ device_size="$(($(cat $syspath/size)/2))"
 sum_size="$(($(grep $(basename $device)[a-z0-9] /proc/partitions|\
     tr -s ' '|cut -d' ' -f4|tr '\n' '+'|sed 's/+$//')))"
 
-get_end()
-{
-    NUM=$1
-    lastpart="$(grep -cE ^'[0-9]{1,}': $TMPFILE)"
-    if [ "$lastpart" = "$NUM" ]; then
-        endsize="$(parted -ms $DEV print| grep ^/ | cut -d: -f2)"
-    else
-        # we are not at the end ! get the start of the next partition
-        # (minus 1 byte) instead of using the absolute end of the disk
-        endsize=$(($(parted -ms $DEV unit B print|grep ^$(($num+1)):|\
-            cut -d: -f2|sed 's/B$//')-1))
-    fi
-    echo "$endsize"
-}
-
-do_gpt()
-{
-    DISK=$1
-
-    PARTNUM="$(sgdisk -p $DISK|grep writable|sed -r 's/^([^ ]*[ ]*){1}([^ ]*).*/\2/')"
-    GUID="$(sgdisk -i $PARTNUM $DISK|grep unique| sed 's/^.*: //g')"
-    FIRST="$(sgdisk -i $PARTNUM $DISK|grep ^First| sed 's/^.*: //g;s/ .*$//')"
-
-    echo "fixing backup GPT" >>$LOGFILE 2>&1
-    sgdisk --move-second-header $DISK >>$LOGFILE 2>&1
-
-    echo "Deleting partition $PARTNUM" >>$LOGFILE 2>&1
-    sgdisk -d $PARTNUM $DISK >>$LOGFILE 2>&1
-
-    echo "Creating partition $PARTNUM at $FIRST" >>$LOGFILE 2>&1
-    sgdisk -n $PARTNUM:$FIRST:0 $DISK >>$LOGFILE 2>&1
-
-    echo "Setting GUID of partition $PARTNUM to $GUID" >>$LOGFILE 2>&1
-    sgdisk -u $PARTNUM:$GUID $DISK >>$LOGFILE 2>&1
-
-    echo "Setting name of $PARTNUM to writable" >>$LOGFILE 2>&1
-    sgdisk -c $PARTNUM:writable $DISK >>$LOGFILE 2>&1
-
-    sgdisk -p $DISK >/run/initramfs/new-gpt-table.txt 2>/dev/null
-}
-
-do_mbr()
-{
-    DEV=$1
-    PART=$2
-    endsize=$(get_end $PART)
-    parted -s $DEV resizepart $PART $endsize
-}
-
-
 free_space=$(($device_size-$sum_size))
 min_free_space=$(($device_size/10))
 
@@ -96,28 +45,13 @@ if [ "$min_free_space" -lt "$free_space" ]; then
     echo "initrd: found more than 10% free space on disk, resizing ${writable_part}" >/dev/kmsg || true
     echo "initrd: partition to full disk size, see ${LOGFILE} for details" >/dev/kmsg || true
     # back up the original partition table for later use or debugging
-    parted -ms $device unit B print >$TMPFILE 2>/dev/null
-    # grow our selected partition to max space available
-    table="$(parted -ms $device print| grep ^/| cut -d: -f6)"
-    case $table in
-        gpt)
-            # do_gpt needs the device name
-            do_gpt $device >>$LOGFILE 2>&1
-            ;;
-        mbr|msdos)
-            # do_mbr needs the device node and partition number
-            do_mbr $device $partition >>$LOGFILE 2>&1
-            resizeopts="-f"
-            ;;
-        *)
-            echo "unknown partition table type, not resizing" >>$LOGFILE
-            exit 0
-            ;;
-    esac
+    sfdisk -d $device >>$LOGFILE 2>&1
+    echo ',+' | sfdisk -N $partition $device >>$LOGFILE 2>&1
+    blockdev -v --rereadpt >>$LOGFILE 2>&1
     # make sure the partitions are ready for further use
     udevadm settle >>$LOGFILE 2>&1
     # check the filesystem before attempting re-size
     e2fsck -fy $writable_part >>$LOGFILE 2>&1
     # resize the filesystem to full size of the partition
-    resize2fs $resizeopts $writable_part >>$LOGFILE 2>&1
+    resize2fs -fp $writable_part >>$LOGFILE 2>&1
 fi