[PATCH] expand-on-first-boot: Make supported filesystems configurable

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

To allow configuring the this support script down to the target
filesystem that shall be expanded, add a variable that specifies those
filesystem types. Default remains both ext4 and btrfs.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

This is on top of https://patchwork.isar-build.org/project/isar/patch/90455867-dcc2-4339...@siemens.com/

.../expand-on-first-boot/expand-on-first-boot_1.6.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
index 071bed24..f873bd29 100644
--- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
+++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
@@ -10,14 +10,16 @@ inherit dpkg-raw
DESCRIPTION = "This service grows the last partition to the full medium during first boot"
MAINTAINER = "isar-users <isar-...@googlegroups.com>"

+EXPAND_FSTYPES ?= "ext4 btrfs"
+
DEBIAN_DEPENDS = " \
systemd, \
sed, \
grep, \
coreutils, \
mount, \
- btrfs-progs, \
- e2fsprogs, \
+ ${@'e2fsprogs' if 'ext4' in d.getVar('EXPAND_FSTYPES').split() else ''}, \
+ ${@'btrfs-progs' if 'btrfs' in d.getVar('EXPAND_FSTYPES').split() else ''}, \
fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), \
util-linux"

--
2.43.0

[Uladzimir Bely]

On Mon, 2024-11-11 at 21:42 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.k...@siemens.com>
>
> To allow configuring the this support script down to the target

"the this" - missing word(s)?

--
Best regards,
Uladzimir.

[Jan Kiszka]

On 12.11.24 12:23, Uladzimir Bely wrote:
> On Mon, 2024-11-11 at 21:42 +0100, 'Jan Kiszka' via isar-users wrote:
>> From: Jan Kiszka <jan.k...@siemens.com>
>>
>> To allow configuring the this support script down to the target
>
> "the this" - missing word(s)?
>

Yeah, v2 on the way.

Jan

Siemens AG, Technology
Linux Expert Center

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

To allow configuring the support script down to the target filesystems

that shall be expanded, add a variable that specifies those filesystem
types. Default remains both ext4 and btrfs.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

Changes in v2:
- fix broken wording in commit message

.../expand-on-first-boot/expand-on-first-boot_1.6.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
index 071bed24..f873bd29 100644
--- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
+++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb

[Uladzimir Bely]

On Wed, 2024-11-13 at 07:45 +0100, Jan Kiszka wrote:
> From: Jan Kiszka <jan.k...@siemens.com>
>
> To allow configuring the support script down to the target
> filesystems
> that shall be expanded, add a variable that specifies those
> filesystem
> types. Default remains both ext4 and btrfs.
>
> Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
> ---
>
> Changes in v2:
>  - fix broken wording in commit message
>
>  .../expand-on-first-boot/expand-on-first-boot_1.6.bb        | 6
> ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>

> diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-
> first-boot_1.6.bb b/meta/recipes-support/expand-on-first-boot/expand-
> on-first-boot_1.6.bb
> index 071bed24..f873bd29 100644
> --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.6.bb
> +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.6.bb

> @@ -10,14 +10,16 @@ inherit dpkg-raw
>  DESCRIPTION = "This service grows the last partition to the full
> medium during first boot"
>  MAINTAINER = "isar-users <isar-...@googlegroups.com>"
>  
> +EXPAND_FSTYPES ?= "ext4 btrfs"
> +
>  DEBIAN_DEPENDS = " \
>      systemd, \
>      sed, \
>      grep, \
>      coreutils, \
>      mount, \
> -    btrfs-progs, \
> -    e2fsprogs, \
> +    ${@'e2fsprogs' if 'ext4' in d.getVar('EXPAND_FSTYPES').split()
> else ''}, \
> +    ${@'btrfs-progs' if 'btrfs' in
> d.getVar('EXPAND_FSTYPES').split() else ''}, \
>      fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), \
>      util-linux"
>  

Applied to next, thanks.

--
Best regards,
Uladzimir.