Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
From:   Andreas Hasenack <andreas@canonical.com>
Date:   Fri, 28 Jul 2023 13:07:14 -0300
Message-ID: <CANYNYEFKtw+_Y-NrOoQt9G9eund2C0=XMrXBj8mt1L=ebrSkLQ@mail.gmail.com>
Subject: [PATCH 1/2] Always run the rpc_pipefs generator
To:     linux-nfs@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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 <andreas.hasenack@canonical.com>
---
 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