diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-11-24 13:45:11 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-05 08:42:04 +0100 |
| commit | d22771fc003caeaa1c2796d31bb4ce7118baf305 (patch) | |
| tree | 575901b62ed8b9e013d17ea84d5b28d25dbcebcc /src/gpt-auto-generator | |
| parent | Merge pull request #25618 from keszybz/sysctl-simplify-writing (diff) | |
| download | systemd-d22771fc003caeaa1c2796d31bb4ce7118baf305.tar.xz systemd-d22771fc003caeaa1c2796d31bb4ce7118baf305.zip | |
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.
Diffstat (limited to 'src/gpt-auto-generator')
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 23a215231c..f2f6cc1a53 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) |