From ebd66065154beca3973ba3f9346e53ac8c0a3ac1 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 5 Dec 2023 14:56:15 +0100 Subject: [PATCH] repart: Add Minimize=best to --make-ddi= partition definitions Otherwise, repart won't calculate the minimal size of the partition automatically and things will fail once the partitions exceed the minimal partition size (10M). --- src/partition/definitions/confext.repart.d/10-root.conf | 1 + src/partition/definitions/confext.repart.d/20-root-verity.conf | 1 + src/partition/definitions/portable.repart.d/10-root.conf | 1 + src/partition/definitions/portable.repart.d/20-root-verity.conf | 1 + src/partition/definitions/sysext.repart.d/10-root.conf | 1 + src/partition/definitions/sysext.repart.d/20-root-verity.conf | 1 + 6 files changed, 6 insertions(+) diff --git a/src/partition/definitions/confext.repart.d/10-root.conf b/src/partition/definitions/confext.repart.d/10-root.conf index e41dc0578b5..f728ab66d59 100644 --- a/src/partition/definitions/confext.repart.d/10-root.conf +++ b/src/partition/definitions/confext.repart.d/10-root.conf @@ -13,3 +13,4 @@ Format=erofs CopyFiles=/etc/ Verity=data VerityMatchKey=root +Minimize=best diff --git a/src/partition/definitions/confext.repart.d/20-root-verity.conf b/src/partition/definitions/confext.repart.d/20-root-verity.conf index 437d88e068e..8179351b6c3 100644 --- a/src/partition/definitions/confext.repart.d/20-root-verity.conf +++ b/src/partition/definitions/confext.repart.d/20-root-verity.conf @@ -11,3 +11,4 @@ Type=root-verity Verity=hash VerityMatchKey=root +Minimize=best diff --git a/src/partition/definitions/portable.repart.d/10-root.conf b/src/partition/definitions/portable.repart.d/10-root.conf index 78758002f56..6f500d04d8a 100644 --- a/src/partition/definitions/portable.repart.d/10-root.conf +++ b/src/partition/definitions/portable.repart.d/10-root.conf @@ -13,3 +13,4 @@ Format=erofs CopyFiles=/ Verity=data VerityMatchKey=root +Minimize=best diff --git a/src/partition/definitions/portable.repart.d/20-root-verity.conf b/src/partition/definitions/portable.repart.d/20-root-verity.conf index 437d88e068e..8179351b6c3 100644 --- a/src/partition/definitions/portable.repart.d/20-root-verity.conf +++ b/src/partition/definitions/portable.repart.d/20-root-verity.conf @@ -11,3 +11,4 @@ Type=root-verity Verity=hash VerityMatchKey=root +Minimize=best diff --git a/src/partition/definitions/sysext.repart.d/10-root.conf b/src/partition/definitions/sysext.repart.d/10-root.conf index c87e1bc5421..b8ef985b926 100644 --- a/src/partition/definitions/sysext.repart.d/10-root.conf +++ b/src/partition/definitions/sysext.repart.d/10-root.conf @@ -14,3 +14,4 @@ CopyFiles=/usr/ CopyFiles=/opt/ Verity=data VerityMatchKey=root +Minimize=best diff --git a/src/partition/definitions/sysext.repart.d/20-root-verity.conf b/src/partition/definitions/sysext.repart.d/20-root-verity.conf index 437d88e068e..8179351b6c3 100644 --- a/src/partition/definitions/sysext.repart.d/20-root-verity.conf +++ b/src/partition/definitions/sysext.repart.d/20-root-verity.conf @@ -11,3 +11,4 @@ Type=root-verity Verity=hash VerityMatchKey=root +Minimize=best -- 2.47.3