| Message ID | 20140220065530.7320.61569.stgit@notabene.brown (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello, I finally got around to playing with these.... Here is what I found. On 02/20/2014 01:55 AM, Neil Brown wrote: > Instead of processing the config information into command lines every > time it might be needed, do it once in a separate service that other > services can Want. > > Signed-off-by: NeilBrown <neilb@suse.de> > --- > systemd/README | 3 +-- > systemd/nfs-config.service | 7 +++++++ > systemd/nfs-idmapd.service | 5 +++-- > systemd/nfs-mountd.service | 5 +++-- > systemd/nfs-server.service | 4 +++- > systemd/rpc-gssd.service | 4 +++- > systemd/rpc-statd-notify.service | 5 +++-- > systemd/rpc-statd.service | 5 +++-- > systemd/rpc-svcgssd.service | 5 +++-- > 9 files changed, 29 insertions(+), 14 deletions(-) > create mode 100644 systemd/nfs-config.service > > diff --git a/systemd/README b/systemd/README > index 8359530098f4..a2a5f0634726 100644 > --- a/systemd/README > +++ b/systemd/README > @@ -56,8 +56,7 @@ Distro specific commandline configuration can be provided by > installing a script /usr/lib/systemd/scripts/nfs-utils_env.sh > This should write /run/sysconfig/nfs-utils based on configuration > information such as in /etc/sysconfig/nfs or /etc/defaults/nfs. > -It should write to a tmp file and rename to the target to > -avoid parallel units seeing incomplete copies of the file. > +It is run once by nfs-config.service. > > rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab > is present. > diff --git a/systemd/nfs-config.service b/systemd/nfs-config.service > new file mode 100644 > index 000000000000..4cf2ecc76e4a > --- /dev/null > +++ b/systemd/nfs-config.service > @@ -0,0 +1,7 @@ > +[Unit] > +Description=Preprocess NFS configuration > + > +[Service] > +type=oneshot This is a typo... It should be Type=oneshot > +RemainAfterExit=yes > +ExecStart=/usr/lib/systemd/scripts/nfs-utils_env.sh Can this be moved from /usr/lib/systemd/scripts to /usr/lib/systemd/system since the scripts directory does not exit and I don't think we want to be creating directories under /usr/lib/systemd/ Finally, Its a bit confusing on how to get the new /run/sysconfig/nfs-utils created. systemctl start nfs-config does not do it but systemctl restart nfs-config. Doesn't this also mean every time /etc/sysconfig/nfs is edited a systemctl restart nfs-config has to be done to update the new /run/sysconfig/nfs-utils and then restart the server they are reconfigured? Or am I missing something? If I'm not it seems a bit overly complicated and its not appeared to be documented anywhere... steved. > diff --git a/systemd/nfs-idmapd.service b/systemd/nfs-idmapd.service > index 7d0dd84d8a44..11895e234438 100644 > --- a/systemd/nfs-idmapd.service > +++ b/systemd/nfs-idmapd.service > @@ -3,9 +3,10 @@ Description=NFSv4 ID-name mapping service > > PartOf=nfs-utils.service > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > - > Type=forking > ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS > diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service > index 90746a854b40..7ccc0f72012d 100644 > --- a/systemd/nfs-mountd.service > +++ b/systemd/nfs-mountd.service > @@ -6,9 +6,10 @@ After=network.target > PartOf=nfs-server.service > PartOf=nfs-utils.service > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > - > Type=forking > ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS > diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service > index 5779fd39ed34..2fa7387e1cb9 100644 > --- a/systemd/nfs-server.service > +++ b/systemd/nfs-server.service > @@ -10,9 +10,11 @@ After= nfs-idmapd.service rpc-statd.service > After= rpc-gssd.service rpc-svcgssd.service > Before= rpc-statd-notify.service > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > Type=oneshot > RemainAfterExit=yes > diff --git a/systemd/rpc-gssd.service b/systemd/rpc-gssd.service > index 375792804247..d4a381904de4 100644 > --- a/systemd/rpc-gssd.service > +++ b/systemd/rpc-gssd.service > @@ -9,9 +9,11 @@ ConditionPathExists=/etc/krb5.keytab > > PartOf=nfs-utils.service > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > Type=forking > ExecStart=/usr/sbin/rpc.gssd $GSSDARGS > diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service > index 7742ac8c5d9a..6b13b323e758 100644 > --- a/systemd/rpc-statd-notify.service > +++ b/systemd/rpc-statd-notify.service > @@ -9,10 +9,11 @@ After=nfs-server.service > > PartOf=nfs-utils.service > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=/usr/lib/systemd/scritps/nfs-utils_env.sh > - > Type=oneshot > RemainAfterExit=yes > ExecStart=-/usr/sbin/sm-notify -d $SMNOTIFYARGS > diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service > index 3f6cda16accd..c5795fd68f96 100644 > --- a/systemd/rpc-statd.service > +++ b/systemd/rpc-statd.service > @@ -7,9 +7,10 @@ After=network.target nss-lookup.target rpcbind.target > > PartOf=nfs-utils.service > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > - > Type=forking > ExecStart=/usr/sbin/rpc.statd --no-notify $STATDARGS > diff --git a/systemd/rpc-svcgssd.service b/systemd/rpc-svcgssd.service > index 6bd45884d991..32b786ec5c7d 100644 > --- a/systemd/rpc-svcgssd.service > +++ b/systemd/rpc-svcgssd.service > @@ -10,9 +10,10 @@ ConditionPathExists=|!@localstatedir@/run/gssproxy.pid > ConditionPathExists=|!/proc/net/rpc/use-gss-proxy > ConditionPathExists=/etc/krb5.keytab > > +Wants=nfs-config.service > +After=nfs-config.service > + > [Service] > EnvironmentFile=-/run/sysconfig/nfs-utils > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > - > Type=forking > ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSDARGS > > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 22 Mar 2014 17:24:59 -0400 Steve Dickson <SteveD@redhat.com> wrote: > Hello, > > I finally got around to playing with these.... > Here is what I found. > > On 02/20/2014 01:55 AM, Neil Brown wrote: > > Instead of processing the config information into command lines every > > time it might be needed, do it once in a separate service that other > > services can Want. > > > > Signed-off-by: NeilBrown <neilb@suse.de> > > --- > > systemd/README | 3 +-- > > systemd/nfs-config.service | 7 +++++++ > > systemd/nfs-idmapd.service | 5 +++-- > > systemd/nfs-mountd.service | 5 +++-- > > systemd/nfs-server.service | 4 +++- > > systemd/rpc-gssd.service | 4 +++- > > systemd/rpc-statd-notify.service | 5 +++-- > > systemd/rpc-statd.service | 5 +++-- > > systemd/rpc-svcgssd.service | 5 +++-- > > 9 files changed, 29 insertions(+), 14 deletions(-) > > create mode 100644 systemd/nfs-config.service > > > > diff --git a/systemd/README b/systemd/README > > index 8359530098f4..a2a5f0634726 100644 > > --- a/systemd/README > > +++ b/systemd/README > > @@ -56,8 +56,7 @@ Distro specific commandline configuration can be provided by > > installing a script /usr/lib/systemd/scripts/nfs-utils_env.sh > > This should write /run/sysconfig/nfs-utils based on configuration > > information such as in /etc/sysconfig/nfs or /etc/defaults/nfs. > > -It should write to a tmp file and rename to the target to > > -avoid parallel units seeing incomplete copies of the file. > > +It is run once by nfs-config.service. > > > > rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab > > is present. > > diff --git a/systemd/nfs-config.service b/systemd/nfs-config.service > > new file mode 100644 > > index 000000000000..4cf2ecc76e4a > > --- /dev/null > > +++ b/systemd/nfs-config.service > > @@ -0,0 +1,7 @@ > > +[Unit] > > +Description=Preprocess NFS configuration > > + > > +[Service] > > +type=oneshot > This is a typo... It should be Type=oneshot Groan. Thanks. > > > +RemainAfterExit=yes > > +ExecStart=/usr/lib/systemd/scripts/nfs-utils_env.sh > Can this be moved from /usr/lib/systemd/scripts to /usr/lib/systemd/system > since the scripts directory does not exit and I don't think we > want to be creating directories under /usr/lib/systemd/ Interesting question. I don't think it really belongs in /usr/lib/systemd/system, though as it has a ".sh" extension systemd isn't going to confuse it for a unit file. However systemd developers seem to have the attitude to just "do it right, even if that means doing something new", and I think a scripts directory is "right", even though it is currently "new". Though it isn't that new - a google for "/usr/lib/systemd/scripts" (in quotes) claim 44000 hits, and those that I looked at are genuine (though probably not all really unique). If we agree that having shell scripts is appropriate we should probably raise the preferred location on the systemd-devel mailing list. > > Finally, Its a bit confusing on how to get the new /run/sysconfig/nfs-utils > created. systemctl start nfs-config does not do it but > systemctl restart nfs-config. > > Doesn't this also mean every time /etc/sysconfig/nfs is edited > a systemctl restart nfs-config has to be done to update the > new /run/sysconfig/nfs-utils and then restart the server > they are reconfigured? Or am I missing something? Fair comment.... Maybe we should use a 'path' unit to run the config-parser every time /etc/sysconfig/nfs changes. I'll see if I can make that work. Thanks, NeilBrown > > If I'm not it seems a bit overly complicated and its not > appeared to be documented anywhere... > > steved. > > > diff --git a/systemd/nfs-idmapd.service b/systemd/nfs-idmapd.service > > index 7d0dd84d8a44..11895e234438 100644 > > --- a/systemd/nfs-idmapd.service > > +++ b/systemd/nfs-idmapd.service > > @@ -3,9 +3,10 @@ Description=NFSv4 ID-name mapping service > > > > PartOf=nfs-utils.service > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > - > > Type=forking > > ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS > > diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service > > index 90746a854b40..7ccc0f72012d 100644 > > --- a/systemd/nfs-mountd.service > > +++ b/systemd/nfs-mountd.service > > @@ -6,9 +6,10 @@ After=network.target > > PartOf=nfs-server.service > > PartOf=nfs-utils.service > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > - > > Type=forking > > ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS > > diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service > > index 5779fd39ed34..2fa7387e1cb9 100644 > > --- a/systemd/nfs-server.service > > +++ b/systemd/nfs-server.service > > @@ -10,9 +10,11 @@ After= nfs-idmapd.service rpc-statd.service > > After= rpc-gssd.service rpc-svcgssd.service > > Before= rpc-statd-notify.service > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > > > Type=oneshot > > RemainAfterExit=yes > > diff --git a/systemd/rpc-gssd.service b/systemd/rpc-gssd.service > > index 375792804247..d4a381904de4 100644 > > --- a/systemd/rpc-gssd.service > > +++ b/systemd/rpc-gssd.service > > @@ -9,9 +9,11 @@ ConditionPathExists=/etc/krb5.keytab > > > > PartOf=nfs-utils.service > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > > > Type=forking > > ExecStart=/usr/sbin/rpc.gssd $GSSDARGS > > diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service > > index 7742ac8c5d9a..6b13b323e758 100644 > > --- a/systemd/rpc-statd-notify.service > > +++ b/systemd/rpc-statd-notify.service > > @@ -9,10 +9,11 @@ After=nfs-server.service > > > > PartOf=nfs-utils.service > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=/usr/lib/systemd/scritps/nfs-utils_env.sh > > - > > Type=oneshot > > RemainAfterExit=yes > > ExecStart=-/usr/sbin/sm-notify -d $SMNOTIFYARGS > > diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service > > index 3f6cda16accd..c5795fd68f96 100644 > > --- a/systemd/rpc-statd.service > > +++ b/systemd/rpc-statd.service > > @@ -7,9 +7,10 @@ After=network.target nss-lookup.target rpcbind.target > > > > PartOf=nfs-utils.service > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > - > > Type=forking > > ExecStart=/usr/sbin/rpc.statd --no-notify $STATDARGS > > diff --git a/systemd/rpc-svcgssd.service b/systemd/rpc-svcgssd.service > > index 6bd45884d991..32b786ec5c7d 100644 > > --- a/systemd/rpc-svcgssd.service > > +++ b/systemd/rpc-svcgssd.service > > @@ -10,9 +10,10 @@ ConditionPathExists=|!@localstatedir@/run/gssproxy.pid > > ConditionPathExists=|!/proc/net/rpc/use-gss-proxy > > ConditionPathExists=/etc/krb5.keytab > > > > +Wants=nfs-config.service > > +After=nfs-config.service > > + > > [Service] > > EnvironmentFile=-/run/sysconfig/nfs-utils > > -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh > > - > > Type=forking > > ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSDARGS > > > >
On 03/23/2014 08:00 PM, NeilBrown wrote: > On Sat, 22 Mar 2014 17:24:59 -0400 Steve Dickson <SteveD@redhat.com> wrote: > >> Hello, >> >> I finally got around to playing with these.... >> Here is what I found. >> >> On 02/20/2014 01:55 AM, Neil Brown wrote: >>> Instead of processing the config information into command lines every >>> time it might be needed, do it once in a separate service that other >>> services can Want. >>> >>> Signed-off-by: NeilBrown <neilb@suse.de> >>> --- >>> systemd/README | 3 +-- >>> systemd/nfs-config.service | 7 +++++++ >>> systemd/nfs-idmapd.service | 5 +++-- >>> systemd/nfs-mountd.service | 5 +++-- >>> systemd/nfs-server.service | 4 +++- >>> systemd/rpc-gssd.service | 4 +++- >>> systemd/rpc-statd-notify.service | 5 +++-- >>> systemd/rpc-statd.service | 5 +++-- >>> systemd/rpc-svcgssd.service | 5 +++-- >>> 9 files changed, 29 insertions(+), 14 deletions(-) >>> create mode 100644 systemd/nfs-config.service >>> >>> diff --git a/systemd/README b/systemd/README >>> index 8359530098f4..a2a5f0634726 100644 >>> --- a/systemd/README >>> +++ b/systemd/README >>> @@ -56,8 +56,7 @@ Distro specific commandline configuration can be provided by >>> installing a script /usr/lib/systemd/scripts/nfs-utils_env.sh >>> This should write /run/sysconfig/nfs-utils based on configuration >>> information such as in /etc/sysconfig/nfs or /etc/defaults/nfs. >>> -It should write to a tmp file and rename to the target to >>> -avoid parallel units seeing incomplete copies of the file. >>> +It is run once by nfs-config.service. >>> >>> rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab >>> is present. >>> diff --git a/systemd/nfs-config.service b/systemd/nfs-config.service >>> new file mode 100644 >>> index 000000000000..4cf2ecc76e4a >>> --- /dev/null >>> +++ b/systemd/nfs-config.service >>> @@ -0,0 +1,7 @@ >>> +[Unit] >>> +Description=Preprocess NFS configuration >>> + >>> +[Service] >>> +type=oneshot >> This is a typo... It should be Type=oneshot > > Groan. Thanks. > > >> >>> +RemainAfterExit=yes >>> +ExecStart=/usr/lib/systemd/scripts/nfs-utils_env.sh >> Can this be moved from /usr/lib/systemd/scripts to /usr/lib/systemd/system >> since the scripts directory does not exit and I don't think we >> want to be creating directories under /usr/lib/systemd/ > > Interesting question. > I don't think it really belongs in /usr/lib/systemd/system, though as it has > a ".sh" extension systemd isn't going to confuse it for a unit file. > However systemd developers seem to have the attitude to just "do it right, > even if that means doing something new", and I think a scripts directory is > "right", even though it is currently "new". > > Though it isn't that new - a google for > "/usr/lib/systemd/scripts" > (in quotes) claim 44000 hits, and those that I looked at are genuine (though > probably not all really unique). I got 44300... ;-) > > If we agree that having shell scripts is appropriate we should probably raise > the preferred location on the systemd-devel mailing list. I was just concern with creating the directory... but it appears to be the right ting to do... > > >> >> Finally, Its a bit confusing on how to get the new /run/sysconfig/nfs-utils >> created. systemctl start nfs-config does not do it but >> systemctl restart nfs-config. >> >> Doesn't this also mean every time /etc/sysconfig/nfs is edited >> a systemctl restart nfs-config has to be done to update the >> new /run/sysconfig/nfs-utils and then restart the server >> they are reconfigured? Or am I missing something? > > Fair comment.... Maybe we should use a 'path' unit to run the config-parser > every time /etc/sysconfig/nfs changes. > I'll see if I can make that work. That would be good... thanks! steved. > > Thanks, > NeilBrown > > > > > >> >> If I'm not it seems a bit overly complicated and its not >> appeared to be documented anywhere... >> >> steved. >> >>> diff --git a/systemd/nfs-idmapd.service b/systemd/nfs-idmapd.service >>> index 7d0dd84d8a44..11895e234438 100644 >>> --- a/systemd/nfs-idmapd.service >>> +++ b/systemd/nfs-idmapd.service >>> @@ -3,9 +3,10 @@ Description=NFSv4 ID-name mapping service >>> >>> PartOf=nfs-utils.service >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh >>> - >>> Type=forking >>> ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS >>> diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service >>> index 90746a854b40..7ccc0f72012d 100644 >>> --- a/systemd/nfs-mountd.service >>> +++ b/systemd/nfs-mountd.service >>> @@ -6,9 +6,10 @@ After=network.target >>> PartOf=nfs-server.service >>> PartOf=nfs-utils.service >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh >>> - >>> Type=forking >>> ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS >>> diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service >>> index 5779fd39ed34..2fa7387e1cb9 100644 >>> --- a/systemd/nfs-server.service >>> +++ b/systemd/nfs-server.service >>> @@ -10,9 +10,11 @@ After= nfs-idmapd.service rpc-statd.service >>> After= rpc-gssd.service rpc-svcgssd.service >>> Before= rpc-statd-notify.service >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh >>> >>> Type=oneshot >>> RemainAfterExit=yes >>> diff --git a/systemd/rpc-gssd.service b/systemd/rpc-gssd.service >>> index 375792804247..d4a381904de4 100644 >>> --- a/systemd/rpc-gssd.service >>> +++ b/systemd/rpc-gssd.service >>> @@ -9,9 +9,11 @@ ConditionPathExists=/etc/krb5.keytab >>> >>> PartOf=nfs-utils.service >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh >>> >>> Type=forking >>> ExecStart=/usr/sbin/rpc.gssd $GSSDARGS >>> diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service >>> index 7742ac8c5d9a..6b13b323e758 100644 >>> --- a/systemd/rpc-statd-notify.service >>> +++ b/systemd/rpc-statd-notify.service >>> @@ -9,10 +9,11 @@ After=nfs-server.service >>> >>> PartOf=nfs-utils.service >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=/usr/lib/systemd/scritps/nfs-utils_env.sh >>> - >>> Type=oneshot >>> RemainAfterExit=yes >>> ExecStart=-/usr/sbin/sm-notify -d $SMNOTIFYARGS >>> diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service >>> index 3f6cda16accd..c5795fd68f96 100644 >>> --- a/systemd/rpc-statd.service >>> +++ b/systemd/rpc-statd.service >>> @@ -7,9 +7,10 @@ After=network.target nss-lookup.target rpcbind.target >>> >>> PartOf=nfs-utils.service >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh >>> - >>> Type=forking >>> ExecStart=/usr/sbin/rpc.statd --no-notify $STATDARGS >>> diff --git a/systemd/rpc-svcgssd.service b/systemd/rpc-svcgssd.service >>> index 6bd45884d991..32b786ec5c7d 100644 >>> --- a/systemd/rpc-svcgssd.service >>> +++ b/systemd/rpc-svcgssd.service >>> @@ -10,9 +10,10 @@ ConditionPathExists=|!@localstatedir@/run/gssproxy.pid >>> ConditionPathExists=|!/proc/net/rpc/use-gss-proxy >>> ConditionPathExists=/etc/krb5.keytab >>> >>> +Wants=nfs-config.service >>> +After=nfs-config.service >>> + >>> [Service] >>> EnvironmentFile=-/run/sysconfig/nfs-utils >>> -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh >>> - >>> Type=forking >>> ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSDARGS >>> >>> > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/systemd/README b/systemd/README index 8359530098f4..a2a5f0634726 100644 --- a/systemd/README +++ b/systemd/README @@ -56,8 +56,7 @@ Distro specific commandline configuration can be provided by installing a script /usr/lib/systemd/scripts/nfs-utils_env.sh This should write /run/sysconfig/nfs-utils based on configuration information such as in /etc/sysconfig/nfs or /etc/defaults/nfs. -It should write to a tmp file and rename to the target to -avoid parallel units seeing incomplete copies of the file. +It is run once by nfs-config.service. rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab is present. diff --git a/systemd/nfs-config.service b/systemd/nfs-config.service new file mode 100644 index 000000000000..4cf2ecc76e4a --- /dev/null +++ b/systemd/nfs-config.service @@ -0,0 +1,7 @@ +[Unit] +Description=Preprocess NFS configuration + +[Service] +type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/nfs-utils_env.sh diff --git a/systemd/nfs-idmapd.service b/systemd/nfs-idmapd.service index 7d0dd84d8a44..11895e234438 100644 --- a/systemd/nfs-idmapd.service +++ b/systemd/nfs-idmapd.service @@ -3,9 +3,10 @@ Description=NFSv4 ID-name mapping service PartOf=nfs-utils.service +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh - Type=forking ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service index 90746a854b40..7ccc0f72012d 100644 --- a/systemd/nfs-mountd.service +++ b/systemd/nfs-mountd.service @@ -6,9 +6,10 @@ After=network.target PartOf=nfs-server.service PartOf=nfs-utils.service +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh - Type=forking ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service index 5779fd39ed34..2fa7387e1cb9 100644 --- a/systemd/nfs-server.service +++ b/systemd/nfs-server.service @@ -10,9 +10,11 @@ After= nfs-idmapd.service rpc-statd.service After= rpc-gssd.service rpc-svcgssd.service Before= rpc-statd-notify.service +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh Type=oneshot RemainAfterExit=yes diff --git a/systemd/rpc-gssd.service b/systemd/rpc-gssd.service index 375792804247..d4a381904de4 100644 --- a/systemd/rpc-gssd.service +++ b/systemd/rpc-gssd.service @@ -9,9 +9,11 @@ ConditionPathExists=/etc/krb5.keytab PartOf=nfs-utils.service +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh Type=forking ExecStart=/usr/sbin/rpc.gssd $GSSDARGS diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service index 7742ac8c5d9a..6b13b323e758 100644 --- a/systemd/rpc-statd-notify.service +++ b/systemd/rpc-statd-notify.service @@ -9,10 +9,11 @@ After=nfs-server.service PartOf=nfs-utils.service +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=/usr/lib/systemd/scritps/nfs-utils_env.sh - Type=oneshot RemainAfterExit=yes ExecStart=-/usr/sbin/sm-notify -d $SMNOTIFYARGS diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service index 3f6cda16accd..c5795fd68f96 100644 --- a/systemd/rpc-statd.service +++ b/systemd/rpc-statd.service @@ -7,9 +7,10 @@ After=network.target nss-lookup.target rpcbind.target PartOf=nfs-utils.service +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh - Type=forking ExecStart=/usr/sbin/rpc.statd --no-notify $STATDARGS diff --git a/systemd/rpc-svcgssd.service b/systemd/rpc-svcgssd.service index 6bd45884d991..32b786ec5c7d 100644 --- a/systemd/rpc-svcgssd.service +++ b/systemd/rpc-svcgssd.service @@ -10,9 +10,10 @@ ConditionPathExists=|!@localstatedir@/run/gssproxy.pid ConditionPathExists=|!/proc/net/rpc/use-gss-proxy ConditionPathExists=/etc/krb5.keytab +Wants=nfs-config.service +After=nfs-config.service + [Service] EnvironmentFile=-/run/sysconfig/nfs-utils -ExecStartPre=-/usr/lib/systemd/scritps/nfs-utils_env.sh - Type=forking ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSDARGS
Instead of processing the config information into command lines every time it might be needed, do it once in a separate service that other services can Want. Signed-off-by: NeilBrown <neilb@suse.de> --- systemd/README | 3 +-- systemd/nfs-config.service | 7 +++++++ systemd/nfs-idmapd.service | 5 +++-- systemd/nfs-mountd.service | 5 +++-- systemd/nfs-server.service | 4 +++- systemd/rpc-gssd.service | 4 +++- systemd/rpc-statd-notify.service | 5 +++-- systemd/rpc-statd.service | 5 +++-- systemd/rpc-svcgssd.service | 5 +++-- 9 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 systemd/nfs-config.service -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html