[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3600/8267] nfs-utils: systemd fixes

[Emmanuele Bassi <ebassi src gnome org>]

commit 44ed428c10cc4591868c198fac55c04e3c2e0758
Author: Andreas Oberritter <obi opendreambox org>
Date:   Wed Nov 30 23:43:01 2016 +0100

    nfs-utils: systemd fixes
    
    - Start daemons by default like the initscripts do, but only if
      /etc/exports exists.
    - Inform systemd.bbclass about nfs-utils-client package.
    
    (From OE-Core rev: 94602d8ced3a8fd033de93b47320c94db6de8755)
    
    Signed-off-by: Andreas Oberritter <obi opendreambox org>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../nfs-utils/nfs-utils/nfs-mountd.service         |    1 +
 .../nfs-utils/nfs-utils/nfs-server.service         |    1 +
 .../nfs-utils/nfs-utils_1.3.4.bb                   |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
index 613ddc0..28b7388 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -2,6 +2,7 @@
 Description=NFS Mount Daemon
 After=rpcbind.service nfs-server.service
 Requires=rpcbind.service nfs-server.service
+ConditionPathExists=@SYSCONFDIR@/exports
 
 [Service]
 EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index 147d7a7..b9dfe74 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -2,6 +2,7 @@
 Description=NFS Server
 Requires=rpcbind.service nfs-mountd.service
 After=rpcbind.service
+ConditionPathExists=@SYSCONFDIR@/exports
 
 [Service]
 Type=oneshot
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index 4d6d808..d4b401e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -48,9 +48,9 @@ INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21"
 
 inherit autotools-brokensep update-rc.d systemd pkgconfig
 
+SYSTEMD_PACKAGES = "${PN} ${PN}-client"
 SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service"
 SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service"
-SYSTEMD_AUTO_ENABLE = "disable"
 
 # --enable-uuid is need for cross-compiling
 EXTRA_OECONF = "--with-statduser=rpcuser \