nfsserver: fix "server scope" to live with additional drop-in files

[zzhou1]

Symptom:

The distro may have additional drop-in files to override ExecStart=, eg. openSUSE. In that case, the result drop-in file is messed up with several ExecStart= generated. For example,

cat /run/systemd/system/nfs-server.service.d/51-resource-agents-unshare-uts.conf

[Service] EnvironmentFile=/run/sysconfig/nfs-server-scope

ExecStart= ExecStart=/usr/bin/unshare --uts /bin/sh -c 'hostname ${NFS_SERVER_SCOPE}; exec "$@"' -- /usr/sbin/rpc.nfsd ExecStart=/usr/bin/unshare --uts /bin/sh -c 'hostname ${NFS_SERVER_SCOPE}; exec "$@"' -- ExecStart=-/usr/bin/unshare --uts /bin/sh -c 'hostname ${NFS_SERVER_SCOPE}; exec "$@"' -- /usr/sbin/rpc.nfsd $NFSD_OPTIONS

Indeed, only the last ExecStart= is needed.

[knet-ci-bot]

Can one of the admins verify this patch?

[zzhou1]

@lge

[oalbrigt]

The added / might cause issues if there are anyone not using full path in their ExecStart=.

[zzhou1]

The added / might cause issues if there are anyone not using full path in their ExecStart=.

hmm, you are right. Let me change "/" prefix to "." ;)

[oalbrigt]

You can remove the .. It already does .*, which covers it.

[zzhou1]

Though remove it is fine, I'm thinking to leave that "." to reinforce at least one character to filter out the empty one.

[oalbrigt]

You should use .+ for that (you might have to use .\+).

[oalbrigt]

ok to test

[oalbrigt]

Thanks.