2023-07-28 16:38:39

by Andreas Hasenack

[permalink] [raw]
Subject: [PATCH 1/2] Always run the rpc_pipefs generator

Shipping both a static unit and a generator to mount rpc_pipefs
increases complexity and can introduce bugs, like seen in [1]. Since
there is a generator, let's use it all the time, even when the
rpc_pipefs mountpoint matches the compiled in default.

1. https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1971935/comments/22

Signed-off-by: Andreas Hasenack <[email protected]>
---
systemd/rpc-pipefs-generator.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/systemd/rpc-pipefs-generator.c b/systemd/rpc-pipefs-generator.c
index 3aaeaeaf..ff6ac988 100644
--- a/systemd/rpc-pipefs-generator.c
+++ b/systemd/rpc-pipefs-generator.c
@@ -140,9 +140,6 @@ int main(int argc, char *argv[])
s = conf_get_str("general", "pipefs-directory");
if (!s)
exit(0);
- if (strlen(s) == strlen(RPC_PIPEFS_DEFAULT) &&
- strcmp(s, RPC_PIPEFS_DEFAULT) == 0)
- exit(0);

if (is_non_pipefs_mountpoint(s))
exit(1);
--
2.39.2