Allow SectorSize= to be overridden by subimages

Fixes #2939

diff --git a/mkosi/config.py b/mkosi/config.py
index 63775c23a8c5175586ed0bd3a28aded2109a6608..7b3d39bc5030fd1c13ddfe134e70609fbaf0dc85 100644 (file)
--- 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 7136a625cc9c69942a6752a7f84393bc2caae511..0d7e540cb0de9f4f6c41743277b50b78b8c1837f 100644 (file)
--- 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