Re: [PATCH v3 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs

[Henning Schild <henning.schild@siemens.com>]

Am Thu, 2 Jun 2022 21:46:00 +0200
schrieb Tobias Schmidl <tobiasschmidl@siemens.com>:

> We want to be more versatile in our approach of resizing the last
> partition. Therefore we switch from resize2fs to systemd-growfs.
> 
> This allows for ext4, btrfs, xfs, and dm-crypt partitions to be
> resized.

LGTM!

We are missing resize test cases, we always have been. I assume you did
test all the filesystems listed here somehow manually.

At some point in the future we might really want those resize test
cases with several wks files to make sure it works and works for all
the filesystems we do care about. Probably extX and btrfs to start with.

Thanks!
Henning

> Since systemd-growfs landed in v236, this obsoletes
> expand-on-first-boot on stretch (v232).
> 
> Signed-off-by: Tobias Schmidl <tobiasschmidl@siemens.com>
> ---
>  ...n-first-boot_1.1.bb => expand-on-first-boot_1.2.bb} |  5 +++--
>  .../files/expand-last-partition.sh                     | 10
> ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-)
>  rename
> meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.1.bb
> => expand-on-first-boot_1.2.bb} (78%)
> 
> diff --git
> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb
> similarity index 78% rename from
> meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> rename to
> meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb
> index 1703a64..48d30d3 100644 ---
> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> +++
> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb
> @@ -1,15 +1,16 @@ # Resize last partition to full medium size on fist
> boot # # This software is a part of ISAR. -# Copyright (c) Siemens
> AG, 2018 +# Copyright (c) Siemens AG, 2018-2022 #
>  # SPDX-License-Identifier: MIT
>  
>  inherit dpkg-raw
>  
>  DESCRIPTION = "This service grows the last partition to the full
> medium during first boot" +MAINTAINER = "isar-users
> <isar-users@googlegroups.com>" 
> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
> fdisk, util-linux" +DEBIAN_DEPENDS = "systemd (>=236), sed, grep,
> coreutils, mount, fdisk, util-linux" 
>  SRC_URI = " \
>      file://expand-on-first-boot.service \
> diff --git
> a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh
> b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh
> index bb371e9..37e94ca 100755 ---
> a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh
> +++
> b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh
> @@ -3,7 +3,7 @@ # Resize last partition to full medium size # # This
> software is a part of ISAR. -# Copyright (c) Siemens AG, 2018
> +# Copyright (c) Siemens AG, 2018-2022
>  #
>  # SPDX-License-Identifier: MIT
>  
> @@ -45,4 +45,10 @@ partx -u "${LAST_PART}"
>  # when using systemd mount units.
>  export EXT2FS_NO_MTAB_OK=1
>  
> -resize2fs "${LAST_PART}"
> +MOUNT_POINT=$(findmnt "${LAST_PART}" -o target -n)
> +if [ -z "$MOUNT_POINT" ]; then
> +	echo "Cannot find mount point for ${LAST_PART}"
> +	exit 1
> +fi
> +mount "${MOUNT_POINT}" || true
> +/lib/systemd/systemd-growfs "${MOUNT_POINT}"