diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-03-19 11:37:52 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2015-03-19 11:44:16 -0400 |
| commit | 8b7bc02a411019fce9ed069a2d18f556c1009150 (patch) | |
| tree | 78553f3e0b9cbf13b761e9cd03983e474ae304b9 | |
| parent | 997148c3d87d4a59a0e542c4fbe77fefc6489e56 (diff) | |
| download | nfs-utils-8b7bc02a411019fce9ed069a2d18f556c1009150.tar.gz nfs-utils-8b7bc02a411019fce9ed069a2d18f556c1009150.tar.xz nfs-utils-8b7bc02a411019fce9ed069a2d18f556c1009150.zip | |
units: nuke nfs-blkmap.target
It seems that the purpose of nfs-blkmap.target was to enable and
disable nfs-blkmap.service. This can be done directly by adding
an [Install] section in nfs-blkmap.service.
The downside of the previous arrangement, apart from the unnecessary
complexity, was a warning during boot:
[ INFO ] PNFS blkmaping enablement. is not active.
[DEPEND] Dependency failed for pNFS block layout mapping daemon.
https://bugzilla.redhat.com/show_bug.cgi?id=1088665
Signed-off-by: Zbigniew J?drzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | systemd/Makefile.am | 1 | ||||
| -rw-r--r-- | systemd/README | 2 | ||||
| -rw-r--r-- | systemd/nfs-blkmap.service | 6 | ||||
| -rw-r--r-- | systemd/nfs-blkmap.target | 8 | ||||
| -rw-r--r-- | systemd/nfs-client.target | 3 |
5 files changed, 5 insertions, 15 deletions
diff --git a/systemd/Makefile.am b/systemd/Makefile.am index 16cf5e6..fbcabb1 100644 --- a/systemd/Makefile.am +++ b/systemd/Makefile.am @@ -3,7 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in unit_files = \ - nfs-blkmap.target \ nfs-client.target \ \ auth-rpcgss-module.service \ diff --git a/systemd/README b/systemd/README index a2a5f06..bbd7790 100644 --- a/systemd/README +++ b/systemd/README @@ -24,7 +24,7 @@ by a suitable 'preset' setting: is started by /usr/sbin/start-statd which mount.nfs will run if statd is needed. - nfs-blkmap.target + nfs-blkmap.service If enabled, then blkmapd will be run when nfs-client.target is started. diff --git a/systemd/nfs-blkmap.service b/systemd/nfs-blkmap.service index f470e3d..5b5a06d 100644 --- a/systemd/nfs-blkmap.service +++ b/systemd/nfs-blkmap.service @@ -5,12 +5,12 @@ Conflicts=umount.target After=var-lib-nfs-rpc_pipefs.mount Requires=var-lib-nfs-rpc_pipefs.mount -Requisite=nfs-blkmap.target -After=nfs-blkmap.target - PartOf=nfs-utils.service [Service] Type=forking PIDFile=/var/run/blkmapd.pid ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS + +[Install] +WantedBy=nfs-client.target diff --git a/systemd/nfs-blkmap.target b/systemd/nfs-blkmap.target deleted file mode 100644 index fbcc111..0000000 --- a/systemd/nfs-blkmap.target +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description= PNFS blkmaping enablement. -# If this target is enabled, then blkmapd will be started -# as required. If it is not enabled it won't. - -[Install] -WantedBy=remote-fs.target -WantedBy=multi-user.target
\ No newline at end of file diff --git a/systemd/nfs-client.target b/systemd/nfs-client.target index 9b792a3..8a8300a 100644 --- a/systemd/nfs-client.target +++ b/systemd/nfs-client.target @@ -5,8 +5,7 @@ Wants=remote-fs-pre.target # Note: we don't "Wants=rpc-statd.service" as "mount.nfs" will arrange to # start that on demand if needed. -Wants=nfs-blkmap.service rpc-statd-notify.service -After=nfs-blkmap.service +Wants=rpc-statd-notify.service # GSS services dependencies and ordering Wants=auth-rpcgss-module.service |