[isar-cip-core,v3] initramfs-crypt-hook: clarify resize error

Commit Message

Quirin Gylstorff Jan. 10, 2025, 4:52 p.m. UTC

From: Quirin Gylstorff <[e-mail]>

Add context to the resizing error as it is was unclear why the
encryption can not continue.

Also fix typo.

Signed-off-by: Quirin Gylstorff <[e-mail]>
---
Changes v3:
 - us "reencryption" instead of encryption
Changes v2:
  - do not skip the check in case of optional encryption
  - add indication what failed to panic message
  - fix typo


 .../initramfs-crypt-hook/files/local-top-complete             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Pavel Machek Jan. 13, 2025, 12:08 p.m. UTC | #1

Hi!

> From: Quirin Gylstorff <[e-mail]>
> 
> Add context to the resizing error as it is was unclear why the
> encryption can not continue.

or fstype: '$partition_fstype'"
>  		;;
>  	*)
> -		panic "cannot resize parition. unsupport fstype: $partition_fstype"
> +		panic "cannot resize partition. unsupport fstype: $partition_fstype"
>  		;;

Should this say "unsupported"?

Best regards,
								Pavel

Jan Kiszka Jan. 13, 2025, 12:13 p.m. UTC | #2

On 13.01.25 13:08, Pavel Machek wrote:
> Hi!
> 
>> From: Quirin Gylstorff <[e-mail]>
>>
>> Add context to the resizing error as it is was unclear why the
>> encryption can not continue.
> 
> or fstype: '$partition_fstype'"
>>  		;;
>>  	*)
>> -		panic "cannot resize parition. unsupport fstype: $partition_fstype"
>> +		panic "cannot resize partition. unsupport fstype: $partition_fstype"
>>  		;;
> 
> Should this say "unsupported"?
> 
> Best regards,
> 								Pavel

Makes sense - I'm folding these suggestions in while merging. And I'm
separating both parts via ','.

Thanks,
Jan

Stephen Ecker Jan. 13, 2025, 3:50 p.m. UTC | #3

Since you're in there, it would be great if you allowed a directive that
passed a resize command, so we can support filesystems this doesn't

On Mon, Jan 13, 2025, 6:08 AM Pavel Machek via lists.cip-project.org <pavel=
[e-mail]> wrote:

> Hi!
>
> > From: Quirin Gylstorff <[e-mail]>
> >
> > Add context to the resizing error as it is was unclear why the
> > encryption can not continue.
>
> or fstype: '$partition_fstype'"
> >               ;;
> >       *)
> > -             panic "cannot resize parition. unsupport fstype:
> $partition_fstype"
> > +             panic "cannot resize partition. unsupport fstype:
> $partition_fstype"
> >               ;;
>
> Should this say "unsupported"?
>
> Best regards,
>                                                                 Pavel
> --
> DENX Software Engineering GmbH,        Managing Director: Erika Unter
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17532):
> https://lists.cip-project.org/g/cip-dev/message/17532
> Mute This Topic: https://lists.cip-project.org/mt/110538292/9242556
> Group Owner: [e-mail]
> Unsubscribe:
> https://lists.cip-project.org/g/cip-dev/leave/13820419/9242556/92422264/xyzzy
> [[e-mail]]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Patch

diff --git a/recipes-initramfs/initramfs-crypt-hook/files/local-top-complete b/recipes-initramfs/initramfs-crypt-hook/files/local-top-complete
index 95d0a5d..9197fb6 100644
--- a/recipes-initramfs/initramfs-crypt-hook/files/local-top-complete
+++ b/recipes-initramfs/initramfs-crypt-hook/files/local-top-complete
@@ -82,14 +82,14 @@  reencrypt_existing_partition() {
 EOF
 		e2fsck -p -f "$1"
 		if ! resize2fs "$1" "${reduced_size_in_kb}"; then
-			panic "reencryption of filesystem $1 cannot continue!"
+			panic "reencryption of partition $1 cannot continue - resizing of the partition failed!"
 		fi
 		;;
 	squashfs|swap|erofs|"")
 		[ "$debug" = "y" ] && echo "skip disk resize as it is not supported or unnecessary for fstype: '$partition_fstype'"
 		;;
 	*)
-		panic "cannot resize parition. unsupport fstype: $partition_fstype"
+		panic "cannot resize partition. unsupport fstype: $partition_fstype"
 		;;
 	esac
 	if [ -x /usr/sbin/cryptsetup-reencrypt ]; then