From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 24 Nov 2022 12:45:11 +0000 (+0100)
Subject: gpt-auto-generator: do not write "noauto" in unit options
X-Git-Tag: v253-rc1~377
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d22771fc003caeaa1c2796d31bb4ce7118baf305;p=thirdparty%2Fsystemd.git

gpt-auto-generator: do not write "noauto" in unit options

"auto"/"noauto" only make sense in the fstab. Putting them in Options= in the
generated unit has no effect and is confusing.
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 23a215231ca..f2f6cc1a53d 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -358,23 +358,19 @@ static int add_automount(
 
         _cleanup_free_ char *unit = NULL, *p = NULL;
         _cleanup_fclose_ FILE *f = NULL;
-        const char *opt = "noauto";
         int r;
 
         assert(id);
         assert(where);
         assert(description);
 
-        if (options)
-                opt = strjoina(options, ",", opt);
-
         r = add_mount(id,
                       what,
                       where,
                       fstype,
                       rw,
                       growfs,
-                      opt,
+                      options,
                       description,
                       NULL);
         if (r < 0)