[PATCH] expand-on-first-boot: Add support for devicemapper

[PATCH] expand-on-first-boot: Add support for devicemapper

[Jan Kiszka]

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

When the rootfs is inside a devicemapper volume, e.g. dm-verity, the
script so far fails to identify the boot device. This adds at least
basic support for that case (single level, single slave). Once there is
a good example for more complex setups, this could be taken into account
as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../expand-on-first-boot/files/expand-last-partition.sh    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 7175dfd3..bb371e9f 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
@@ -10,8 +10,13 @@
 set -e
 
 ROOT_DEV="$(findmnt / -o source -n)"
-BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
+ROOT_DEV_NAME=${ROOT_DEV##*/}
+ROOT_DEV_SLAVE=$(ls -d /sys/block/${ROOT_DEV_NAME}/slaves/* 2>/dev/null | head -1)
+if [ -n ${ROOT_DEV_SLAVE} ]; then
+	ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
+fi
 
+BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
 if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then
 	echo "Boot device equals root device - no partitioning found" >&2
 	exit 1
-- 
2.34.1

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Henning Schild]

I learned yesterday about systemd-repart
https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html

We should look at this and how mkosi puts/uses it for debian.

Not a review, just a generic remark that there might be more powerful
and ready to use tools out there. At some point i will play with this
and see if it can replace expand-on-first-boot, i bet we will soon hear
the first btrfs stories ... and maybe luks.

I know people do that with isar and their own funny scripting which can
not be found upstream.

Am Thu, 21 Apr 2022 19:10:44 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> When the rootfs is inside a devicemapper volume, e.g. dm-verity, the
> script so far fails to identify the boot device. This adds at least
> basic support for that case (single level, single slave). Once there
> is a good example for more complex setups, this could be taken into
> account as well.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  .../expand-on-first-boot/files/expand-last-partition.sh    | 7
> ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
> 
> 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 7175dfd3..bb371e9f 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
> @@ -10,8 +10,13 @@ set -e ROOT_DEV="$(findmnt / -o source -n)"
> -BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
> +ROOT_DEV_NAME=${ROOT_DEV##*/}
> +ROOT_DEV_SLAVE=$(ls -d /sys/block/${ROOT_DEV_NAME}/slaves/*
> 2>/dev/null | head -1) +if [ -n ${ROOT_DEV_SLAVE} ]; then
> +	ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
> +fi
>  
> +BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"

Please add a wks and switch at least one CI target. In case wic can not
generate that dm-verity ... NACK, or provide the wic plugin as well.

Henning

>  if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then
>  	echo "Boot device equals root device - no partitioning
> found" >&2 exit 1

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Jan Kiszka]

On 21.04.22 19:43, Henning Schild wrote:
> I learned yesterday about systemd-repart
> https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html
> 
> We should look at this and how mkosi puts/uses it for debian.
> 

+ systemd-growfs, yes, these are possibly alternative building blocks
for such a service. Quickly scanned mkosi but couldn't find the require
glue yet, unfortunately.

> Not a review, just a generic remark that there might be more powerful
> and ready to use tools out there. At some point i will play with this
> and see if it can replace expand-on-first-boot, i bet we will soon hear
> the first btrfs stories ... and maybe luks.
> 
> I know people do that with isar and their own funny scripting which can
> not be found upstream.

We would surely want to switch here, but we need the right pattern
first. A script or a cascade of dependent and accordingly configured
services will remain, though.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Henning Schild]

Am Thu, 21 Apr 2022 19:43:47 +0200
schrieb Henning Schild <henning.schild@siemens.com>:

> I learned yesterday about systemd-repart
> https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html

This currently needs >= bookworm to even start playing with systemd >=
250.1-2

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976959

So maybe a little too early for isar, but still something we could look
into.

systemd-growfs is also available in older versions, but that just deals
with the filesystem, not with the partition table.

Henning

> We should look at this and how mkosi puts/uses it for debian.
> 
> Not a review, just a generic remark that there might be more powerful
> and ready to use tools out there. At some point i will play with this
> and see if it can replace expand-on-first-boot, i bet we will soon
> hear the first btrfs stories ... and maybe luks.
> 
> I know people do that with isar and their own funny scripting which
> can not be found upstream.
> 
> Am Thu, 21 Apr 2022 19:10:44 +0200
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> > 
> > When the rootfs is inside a devicemapper volume, e.g. dm-verity, the
> > script so far fails to identify the boot device. This adds at least
> > basic support for that case (single level, single slave). Once there
> > is a good example for more complex setups, this could be taken into
> > account as well.
> > 
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > ---
> >  .../expand-on-first-boot/files/expand-last-partition.sh    | 7
> > ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
> > 
> > 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 7175dfd3..bb371e9f 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
> > @@ -10,8 +10,13 @@ set -e ROOT_DEV="$(findmnt / -o source -n)"
> > -BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
> > +ROOT_DEV_NAME=${ROOT_DEV##*/}
> > +ROOT_DEV_SLAVE=$(ls -d /sys/block/${ROOT_DEV_NAME}/slaves/*  
> > 2>/dev/null | head -1) +if [ -n ${ROOT_DEV_SLAVE} ]; then  
> > +	ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
> > +fi
> >  
> > +BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"  
> 
> Please add a wks and switch at least one CI target. In case wic can
> not generate that dm-verity ... NACK, or provide the wic plugin as
> well.
> 
> Henning
> 
> >  if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then
> >  	echo "Boot device equals root device - no partitioning
> > found" >&2 exit 1  
> 

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Tobias Schaffner]

Switching to systemd-repart would also fix a rare race condition. 
Expand-on-first-boot can cause systemd to not be able to mount its mount 
units if it makes the kernel reload the partition table in a bad moment.

Tobias

On 4/21/22 21:05, Henning Schild wrote:
> Am Thu, 21 Apr 2022 19:43:47 +0200
> schrieb Henning Schild <henning.schild@siemens.com>:
> 
>> I learned yesterday about systemd-repart
>> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.freedesktop.org%2Fsoftware%2Fsystemd%2Fman%2Fsystemd-repart.service.html&amp;data=05%7C01%7Ctobias.schaffner%40siemens.com%7C045ffc25cea442b91a7808da23c9e432%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637861648059484524%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=qlzBS8YjhJBvZE7LnofOlT6uE76Nrsu45xZ25E9ocj4%3D&amp;reserved=0
> 
> This currently needs >= bookworm to even start playing with systemd >=
> 250.1-2
> 
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.debian.org%2Fcgi-bin%2Fbugreport.cgi%3Fbug%3D976959&amp;data=05%7C01%7Ctobias.schaffner%40siemens.com%7C045ffc25cea442b91a7808da23c9e432%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637861648059484524%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Zlq1hF7%2BbE5FS3gayX6jhaVzykvJNrwc1lhITORUZ%2BU%3D&amp;reserved=0
> 
> So maybe a little too early for isar, but still something we could look
> into.
> 
> systemd-growfs is also available in older versions, but that just deals
> with the filesystem, not with the partition table.
> 
> Henning
> 
>> We should look at this and how mkosi puts/uses it for debian.
>>
>> Not a review, just a generic remark that there might be more powerful
>> and ready to use tools out there. At some point i will play with this
>> and see if it can replace expand-on-first-boot, i bet we will soon
>> hear the first btrfs stories ... and maybe luks.
>>
>> I know people do that with isar and their own funny scripting which
>> can not be found upstream.
>>
>> Am Thu, 21 Apr 2022 19:10:44 +0200
>> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
>>
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>
>>> When the rootfs is inside a devicemapper volume, e.g. dm-verity, the
>>> script so far fails to identify the boot device. This adds at least
>>> basic support for that case (single level, single slave). Once there
>>> is a good example for more complex setups, this could be taken into
>>> account as well.
>>>
>>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> ---
>>>   .../expand-on-first-boot/files/expand-last-partition.sh    | 7
>>> ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
>>>
>>> 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 7175dfd3..bb371e9f 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
>>> @@ -10,8 +10,13 @@ set -e ROOT_DEV="$(findmnt / -o source -n)"
>>> -BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
>>> +ROOT_DEV_NAME=${ROOT_DEV##*/}
>>> +ROOT_DEV_SLAVE=$(ls -d /sys/block/${ROOT_DEV_NAME}/slaves/*
>>> 2>/dev/null | head -1) +if [ -n ${ROOT_DEV_SLAVE} ]; then
>>> +	ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
>>> +fi
>>>   
>>> +BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
>>
>> Please add a wks and switch at least one CI target. In case wic can
>> not generate that dm-verity ... NACK, or provide the wic plugin as
>> well.
>>
>> Henning
>>
>>>   if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then
>>>   	echo "Boot device equals root device - no partitioning
>>> found" >&2 exit 1
>>
> 

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Henning Schild]

Am Fri, 22 Apr 2022 08:28:22 +0200
schrieb Tobias Schaffner <tobias.schaffner@siemens.com>:

> Switching to systemd-repart would also fix a rare race condition. 
> Expand-on-first-boot can cause systemd to not be able to mount its
> mount units if it makes the kernel reload the partition table in a
> bad moment.

I do not think we will be able to replace expand-on-first-boot entirely
with systemd-repart. Having distros which do not support that yet and
potentially having images without systemd even.

So if there is such a race a fix for it would be highly appreciated.
Could be a matter of unit dependencies.

In fact i will look into adding a test for expansion to CI.

Can be done with qemu-img resize or maybe a wic spacer and installing
"expand-on-first-boot".

Henning

> Tobias
> 
> On 4/21/22 21:05, Henning Schild wrote:
> > Am Thu, 21 Apr 2022 19:43:47 +0200
> > schrieb Henning Schild <henning.schild@siemens.com>:
> >   
> >> I learned yesterday about systemd-repart
> >> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.freedesktop.org%2Fsoftware%2Fsystemd%2Fman%2Fsystemd-repart.service.html&amp;data=05%7C01%7Ctobias.schaffner%40siemens.com%7C045ffc25cea442b91a7808da23c9e432%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637861648059484524%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=qlzBS8YjhJBvZE7LnofOlT6uE76Nrsu45xZ25E9ocj4%3D&amp;reserved=0
> >>  
> > 
> > This currently needs >= bookworm to even start playing with systemd
> > >= 250.1-2
> > 
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.debian.org%2Fcgi-bin%2Fbugreport.cgi%3Fbug%3D976959&amp;data=05%7C01%7Ctobias.schaffner%40siemens.com%7C045ffc25cea442b91a7808da23c9e432%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637861648059484524%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Zlq1hF7%2BbE5FS3gayX6jhaVzykvJNrwc1lhITORUZ%2BU%3D&amp;reserved=0
> > 
> > So maybe a little too early for isar, but still something we could
> > look into.
> > 
> > systemd-growfs is also available in older versions, but that just
> > deals with the filesystem, not with the partition table.
> > 
> > Henning
> >   
> >> We should look at this and how mkosi puts/uses it for debian.
> >>
> >> Not a review, just a generic remark that there might be more
> >> powerful and ready to use tools out there. At some point i will
> >> play with this and see if it can replace expand-on-first-boot, i
> >> bet we will soon hear the first btrfs stories ... and maybe luks.
> >>
> >> I know people do that with isar and their own funny scripting which
> >> can not be found upstream.
> >>
> >> Am Thu, 21 Apr 2022 19:10:44 +0200
> >> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> >>  
> >>> From: Jan Kiszka <jan.kiszka@siemens.com>
> >>>
> >>> When the rootfs is inside a devicemapper volume, e.g. dm-verity,
> >>> the script so far fails to identify the boot device. This adds at
> >>> least basic support for that case (single level, single slave).
> >>> Once there is a good example for more complex setups, this could
> >>> be taken into account as well.
> >>>
> >>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> >>> ---
> >>>   .../expand-on-first-boot/files/expand-last-partition.sh    | 7
> >>> ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
> >>>
> >>> 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 7175dfd3..bb371e9f 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
> >>> @@ -10,8 +10,13 @@ set -e ROOT_DEV="$(findmnt / -o source -n)"
> >>> -BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"
> >>> +ROOT_DEV_NAME=${ROOT_DEV##*/}
> >>> +ROOT_DEV_SLAVE=$(ls -d /sys/block/${ROOT_DEV_NAME}/slaves/*  
> >>> 2>/dev/null | head -1) +if [ -n ${ROOT_DEV_SLAVE} ]; then  
> >>> +	ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
> >>> +fi
> >>>   
> >>> +BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')"  
> >>
> >> Please add a wks and switch at least one CI target. In case wic can
> >> not generate that dm-verity ... NACK, or provide the wic plugin as
> >> well.
> >>
> >> Henning
> >>  
> >>>   if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then
> >>>   	echo "Boot device equals root device - no partitioning
> >>> found" >&2 exit 1  
> >>  
> >   

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Jan Kiszka]

On 22.04.22 08:28, Tobias Schaffner wrote:
> Switching to systemd-repart would also fix a rare race condition.
> Expand-on-first-boot can cause systemd to not be able to mount its mount
> units if it makes the kernel reload the partition table in a bad moment.
> 

That is to be proven, but it would be valuable to check. I just "lost"
my reproduction case on the IOT2050 by dropping the pattern that
triggered it. If you still have it, please check that!

Jan

PS: Avoid top-posing on mailing lists ;)

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Anton Mikanovich]

21.04.2022 20:10, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> When the rootfs is inside a devicemapper volume, e.g. dm-verity, the
> script so far fails to identify the boot device. This adds at least
> basic support for that case (single level, single slave). Once there is
> a good example for more complex setups, this could be taken into account
> as well.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to next, thanks.

RE: [PATCH] expand-on-first-boot: Add support for devicemapper

[Moessbauer, Felix]

> -----Original Message-----
> From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> Behalf Of Anton Mikanovich
> Sent: Saturday, May 14, 2022 4:06 PM
> To: Kiszka, Jan (T CED) <jan.kiszka@siemens.com>; isar-users <isar-
> users@googlegroups.com>
> Cc: Storm, Christian (T CED SES-DE) <christian.storm@siemens.com>
> Subject: Re: [PATCH] expand-on-first-boot: Add support for devicemapper
> 
> 21.04.2022 20:10, Jan Kiszka wrote:
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> >
> > When the rootfs is inside a devicemapper volume, e.g. dm-verity, the
> > script so far fails to identify the boot device. This adds at least
> > basic support for that case (single level, single slave). Once there
> > is a good example for more complex setups, this could be taken into
> > account as well.
> >
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Applied to next, thanks.

This patch breaks very simple partition layouts like the following:

$> mount | grep sda
/dev/sda2 on / type ext4 (rw,relatime)
/dev/sda1 on /boot type vfat (rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro)

With this layout, the service fails with the following error:
Boot device equals root device - no partitioning found

@Jan: It looks like the check of the device slaves is not sane.
Could you please have a second look and try to fix it?

It also makes me wonder why the CI did not find it.

Felix

> 
> --
> You received this message because you are subscribed to the Google Groups
> "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email
> to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.g
> oogle.com%2Fd%2Fmsgid%2Fisar-users%2Fa016bb05-21c1-e179-68cc-
> f1d96311e210%2540ilbers.de&amp;data=05%7C01%7Cfelix.moessbauer%40sie
> mens.com%7Ce400a882e3df426ed81508da35b2d6e4%7C38ae3bcd95794fd4ad
> dab42e1495d55a%7C1%7C0%7C637881340185739960%7CUnknown%7CTWFpb
> GZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6M
> n0%3D%7C2000%7C%7C%7C&amp;sdata=SKokXmDUdxOGDDRMs4pn4VUu4bv
> WO5iDgl%2BwBWT2lsI%3D&amp;reserved=0.

Re: [PATCH] expand-on-first-boot: Add support for devicemapper

[Henning Schild]

Am Thu, 19 May 2022 11:51:01 +0000
schrieb "Moessbauer, Felix" <felix.moessbauer@siemens.com>:

> > -----Original Message-----
> > From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> > Behalf Of Anton Mikanovich
> > Sent: Saturday, May 14, 2022 4:06 PM
> > To: Kiszka, Jan (T CED) <jan.kiszka@siemens.com>; isar-users <isar-
> > users@googlegroups.com>  
> > Cc: Storm, Christian (T CED SES-DE) <christian.storm@siemens.com>
> > Subject: Re: [PATCH] expand-on-first-boot: Add support for
> > devicemapper
> > 
> > 21.04.2022 20:10, Jan Kiszka wrote:  
> > > From: Jan Kiszka <jan.kiszka@siemens.com>
> > >
> > > When the rootfs is inside a devicemapper volume, e.g. dm-verity,
> > > the script so far fails to identify the boot device. This adds at
> > > least basic support for that case (single level, single slave).
> > > Once there is a good example for more complex setups, this could
> > > be taken into account as well.
> > >
> > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>  
> > 
> > Applied to next, thanks.  
> 
> This patch breaks very simple partition layouts like the following:
> 
> $> mount | grep sda  
> /dev/sda2 on / type ext4 (rw,relatime)
> /dev/sda1 on /boot type vfat
> (rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro)
> 
> With this layout, the service fails with the following error:
> Boot device equals root device - no partitioning found
> 
> @Jan: It looks like the check of the device slaves is not sane.
> Could you please have a second look and try to fix it?
> 
> It also makes me wonder why the CI did not find it.

I think expand is not covered in any of our CI configs. We currently
have Tobias working on systemd growfs and repart, and might see more
testing coming with his patches. Hopefully including also a "qemu-img
convert resize" to see it grow and possibly check that it really did.

Henning

> Felix
> 
> > 
> > --
> > You received this message because you are subscribed to the Google
> > Groups "isar-users" group.
> > To unsubscribe from this group and stop receiving emails from it,
> > send an email to isar-users+unsubscribe@googlegroups.com.
> > To view this discussion on the web visit
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.g
> > oogle.com%2Fd%2Fmsgid%2Fisar-users%2Fa016bb05-21c1-e179-68cc-
> > f1d96311e210%2540ilbers.de&amp;data=05%7C01%7Cfelix.moessbauer%40sie
> > mens.com%7Ce400a882e3df426ed81508da35b2d6e4%7C38ae3bcd95794fd4ad
> > dab42e1495d55a%7C1%7C0%7C637881340185739960%7CUnknown%7CTWFpb
> > GZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6M
> > n0%3D%7C2000%7C%7C%7C&amp;sdata=SKokXmDUdxOGDDRMs4pn4VUu4bv
> > WO5iDgl%2BwBWT2lsI%3D&amp;reserved=0.  
>