diff options
| author | NeilBrown <neilb@suse.de> | 2014-02-13 13:52:42 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2014-03-24 16:30:04 -0400 |
| commit | d5bd709307a05e14b7a2441b7576b68db85237c1 (patch) | |
| tree | 7ea5a46a0241f63f458f9af95a597b38d49f6071 /systemd | |
| parent | c0512981b7e10487378e5c6fec5d7d72dd4f7e1a (diff) | |
| download | nfs-utils-d5bd709307a05e14b7a2441b7576b68db85237c1.tar.gz nfs-utils-d5bd709307a05e14b7a2441b7576b68db85237c1.tar.xz nfs-utils-d5bd709307a05e14b7a2441b7576b68db85237c1.zip | |
systemd: tidy up DefaultDependencies
DefaultDependencies should be "yes" (the default) for things
needed only be the NFS server, as that is a service that doesn't
need to start early.
DefaultDependencies should be "no" for things needed to mount an
NFS filesystem, and filesystems are mounted before basic.target.
To ensure these services are shut down in a timely fashion, they
must Conflict with systemd.umount so they are shutdown when everything
is unmounted.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/nfs-blkmap.service | 2 | ||||
| -rw-r--r-- | systemd/nfs-server.service | 3 | ||||
| -rw-r--r-- | systemd/proc-fs-nfsd.mount | 1 | ||||
| -rw-r--r-- | systemd/rpc-gssd.service | 2 | ||||
| -rw-r--r-- | systemd/rpc-statd-notify.service | 1 | ||||
| -rw-r--r-- | systemd/rpc-statd.service | 1 | ||||
| -rw-r--r-- | systemd/var-lib-nfs-rpc_pipefs.mount | 1 |
7 files changed, 7 insertions, 4 deletions
diff --git a/systemd/nfs-blkmap.service b/systemd/nfs-blkmap.service index 80033f2..4b74e9f 100644 --- a/systemd/nfs-blkmap.service +++ b/systemd/nfs-blkmap.service @@ -1,5 +1,7 @@ [Unit] Description=pNFS block layout mapping daemon +DefaultDependencies=no +Conflicts=umount.target After=var-lib-nfs-rpc_pipefs.mount Requires=var-lib-nfs-rpc_pipefs.mount diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service index 9812866..dfe8dfa 100644 --- a/systemd/nfs-server.service +++ b/systemd/nfs-server.service @@ -1,6 +1,5 @@ [Unit] -Description=NFS server -DefaultDependencies=no +Description=NFS server and services Requires= network.target proc-fs-nfsd.mount rpcbind.target PartOf=nfs-server.target diff --git a/systemd/proc-fs-nfsd.mount b/systemd/proc-fs-nfsd.mount index f44d52f..931a5ce 100644 --- a/systemd/proc-fs-nfsd.mount +++ b/systemd/proc-fs-nfsd.mount @@ -1,6 +1,5 @@ [Unit] Description=NFSD configuration filesystem -DefaultDependencies=no [Mount] What=nfsd diff --git a/systemd/rpc-gssd.service b/systemd/rpc-gssd.service index c25f5c0..2285982 100644 --- a/systemd/rpc-gssd.service +++ b/systemd/rpc-gssd.service @@ -1,5 +1,7 @@ [Unit] Description=RPC security service for NFS client and server +DefaultDependencies=no +Conflicts=umount.target Requires=var-lib-nfs-rpc_pipefs.mount After=var-lib-nfs-rpc_pipefs.mount diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service index 532354d..7742ac8 100644 --- a/systemd/rpc-statd-notify.service +++ b/systemd/rpc-statd-notify.service @@ -1,6 +1,5 @@ [Unit] Description=Notify NFS peers of a restart -DefaultDependencies=no Requires=network-online.target After=network-online.target nss-lookup.target diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service index 88d2527..3f6cda1 100644 --- a/systemd/rpc-statd.service +++ b/systemd/rpc-statd.service @@ -1,6 +1,7 @@ [Unit] Description=NFS status monitor for NFSv2/3 locking. DefaultDependencies=no +Conflicts=umount.target Requires=nss-lookup.target rpcbind.target After=network.target nss-lookup.target rpcbind.target diff --git a/systemd/var-lib-nfs-rpc_pipefs.mount b/systemd/var-lib-nfs-rpc_pipefs.mount index cd614cf..33c5db6 100644 --- a/systemd/var-lib-nfs-rpc_pipefs.mount +++ b/systemd/var-lib-nfs-rpc_pipefs.mount @@ -1,6 +1,7 @@ [Unit] Description=RPC Pipe File System DefaultDependencies=no +Conflicts=umount.target [Mount] What=sunrpc |