Only one minor observation that I should have made sooner (so if there are other changes that might warrant a v6, great, but otherwise I don't think it's necessary). [[PATCH v5 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs] On 22.06.30 (Thu 15:55) Tobias Schmidl wrote: > 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. > > Since systemd-growfs landed in v236, this obsoletes expand-on-first-boot > on stretch (v232). > > Signed-off-by: Tobias Schmidl > --- > ...oot_1.1.bb => expand-on-first-boot_1.2.bb} | 5 +++-- > .../files/expand-last-partition.sh | 19 +++++++++++++++++-- > 2 files changed, 20 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 " > > -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 c0edde7..31f1ae3 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,19 @@ partx -u "${LAST_PART}" > # when using systemd mount units. > export EXT2FS_NO_MTAB_OK=1 > > -resize2fs "${LAST_PART}" > +if grep -q x-systemd.growfs /etc/fstab; then > + echo "Found x-systemd.growfs option in /etc/fstab, won't call it explicitly." >&2 > + exit 0 > +fi > + > +# mount $LAST_PART out of tree, so we won't conflict with other mounts > +MOUNT_POINT=$(mktemp -d -p /mnt "$(basename "$0").XXXXXXXXXX") > +if [ ! -d "${MOUNT_POINT}" ]; then > + echo "Cannot create temporary mount point ${MOUNT_POINT}." >&2 This error message may be a bit more helpful if it stated the impact of this problem. Something like this, instead: echo "Cannot create temporary mount point ${MOUNT_POINT}, ${LAST_PART} will not be resized." >&2 -J. > + exit 1 > +fi > + > +mount "${LAST_PART}" "${MOUNT_POINT}" > +/lib/systemd/systemd-growfs "${MOUNT_POINT}" > +umount "${MOUNT_POINT}" > +rmdir "${MOUNT_POINT}" > -- > 2.36.1 > -- -Joe MacDonald. Linux Architect | Siemens Digital Industries Software :wq