From 412eee2f980e7ada84208df5de68f203e68eb4f9 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Wed, 6 Jun 2018 17:00:19 +0200
Subject: NFS: fix dependency with automount

---
 etc/ncp-config.d/NFS.sh | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

(limited to 'etc')

diff --git a/etc/ncp-config.d/NFS.sh b/etc/ncp-config.d/NFS.sh
index 9fd6e715..db9d4336 100644
--- a/etc/ncp-config.d/NFS.sh
+++ b/etc/ncp-config.d/NFS.sh
@@ -28,39 +28,8 @@ install()
   systemctl disable nfs-kernel-server
   systemctl mask nfs-blkmap
 
-  cat > /etc/systemd/system/nfs-common.services <<EOF
-[Unit]
-Description=NFS Common daemons
-Wants=remote-fs-pre.target
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/init.d/nfs-common start
-ExecStop=/etc/init.d/nfs-common stop
-
-[Install]
-WantedBy=sysinit.target
-EOF
-
-  cat > /etc/systemd/system/rpcbind.service <<EOF
-[Unit]
-Description=RPC bind portmap service
-After=systemd-tmpfiles-setup.service
-Wants=remote-fs-pre.target
-Before=remote-fs-pre.target
-DefaultDependencies=no
-
-[Service]
-ExecStart=/sbin/rpcbind -f -w
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=sysinit.target
-Alias=portmap
-EOF
+  # delay init because of automount
+  sed -i 's|^ExecStartPre=.*|ExecStartPre=/bin/bash -c "/bin/sleep 30; /usr/sbin/exportfs -r"|' /lib/systemd/system/nfs-server.service
 }
 
 configure()
-- 
cgit v1.2.3