nfsserver: fix "server scope" to live with additional drop-in files #1842
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
|
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 "." ;) |
|
You can remove the |
|
Though remove it is fine, I'm thinking to leave that "." to reinforce at least one character to filter out the empty one. |
|
You should use |
…rop-in files
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.
|
ok to test |
|
Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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=${NFS_SERVER_SCOPE}; exec "$ @"' -- /usr/sbin/rpc.nfsd ExecStart=/usr/bin/unshare --uts /bin/sh -c 'hostname ${NFS_SERVER_SCOPE}; exec "$ @"' --${NFS_SERVER_SCOPE}; exec "$ @"' -- /usr/sbin/rpc.nfsd $NFSD_OPTIONS
ExecStart=/usr/bin/unshare --uts /bin/sh -c 'hostname
ExecStart=-/usr/bin/unshare --uts /bin/sh -c 'hostname
Indeed, only the last ExecStart= is needed.