From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 5 Aug 2024 08:46:46 +0000 (+0200)
Subject: Allow SectorSize= to be overridden by subimages
X-Git-Tag: v25~370^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2941%2Fhead;p=thirdparty%2Fmkosi.git

Allow SectorSize= to be overridden by subimages

Fixes #2939
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 63775c23a..7b3d39bc5 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2175,7 +2175,7 @@ SETTINGS = (
         section="Output",
         parse=config_parse_sector_size,
         help="Set the disk image sector size",
-        scope=SettingScope.universal,
+        scope=SettingScope.inherit,
     ),
     ConfigSetting(
         dest="repart_offline",
diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 7136a625c..0d7e540cb 100644
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -2491,7 +2491,6 @@ overridden):
 - `CacheDirectory=`
 - `PackageCacheDirectory=`
 - `BuildDirectory=`
-- `SectorSize=`
 - `RepartOffline=`
 - `UseSubvolumes=`
 - `PackageDirectories=`
@@ -2521,6 +2520,7 @@ subimages but can be overridden:
 
 - `ImageId=`
 - `ImageVersion=`
+- `SectorSize=`
 
 Images can refer to outputs of images they depend on. Specifically,
 for the following options, mkosi will only check whether the inputs