From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 15 Aug 2023 10:10:14 +0000 (+0200)
Subject: mkfs-util: Don't set MKE2FS_DEVICE_PHYS_SECTSIZE
X-Git-Tag: v255-rc1~718^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1110c81d8e943a8895a8a07ba84986a74b0943c;p=thirdparty%2Fsystemd.git

mkfs-util: Don't set MKE2FS_DEVICE_PHYS_SECTSIZE

We only care about the logical sector size and if the physical sector
size isn't set and we're operating on a file, mke2fs will default the
physical sector size to the logical block size anyway.

This change makes sure that if we're operating on a block device and
set an explicit logical sector size, that doesn't affect the physical
sector size.
---

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 3111bc0acc1..b936a4733f4 100644
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -432,14 +432,13 @@ int make_filesystem(
                 if (quiet && strv_extend(&argv, "-q") < 0)
                         return log_oom();
 
-                if (sector_size > 0)
-                        FOREACH_STRING(s, "MKE2FS_DEVICE_SECTSIZE", "MKE2FS_DEVICE_PHYS_SECTSIZE") {
-                                if (strv_extend(&env, s) < 0)
+                if (sector_size > 0) {
+                        if (strv_extend(&env, "MKE2FS_DEVICE_SECTSIZE") < 0)
                                         return log_oom();
 
-                                if (strv_extendf(&env, "%"PRIu64, sector_size) < 0)
-                                        return log_oom();
-                        }
+                        if (strv_extendf(&env, "%"PRIu64, sector_size) < 0)
+                                return log_oom();
+                }
 
         } else if (streq(fstype, "btrfs")) {
                 argv = strv_new(mkfs,