From 0f94eb11038aef39e91b154ce1d29a6cca8e1282 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 6 Oct 2012 16:18:15 +0200
Subject: [PATCH] nfs-utils: do not enable systemd services by default, add a
 mutable file to -server.

---
 srcpkgs/nfs-utils/nfs-utils-server.template |  9 +++++++--
 srcpkgs/nfs-utils/template                  | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/nfs-utils/nfs-utils-server.template b/srcpkgs/nfs-utils/nfs-utils-server.template
index 3b68388b80e..53b189d5597 100644
--- a/srcpkgs/nfs-utils/nfs-utils-server.template
+++ b/srcpkgs/nfs-utils/nfs-utils-server.template
@@ -8,8 +8,13 @@ long_desc="
 depends="rpcbind"
 replaces="nfs-utils<1.2.6_2"
 conf_files="/etc/exports"
-mutable_files="/var/lib/nfs/etab /var/lib/nfs/rmtab /var/lib/nfs/xtab"
-systemd_services="nfsd.service on rpc-mountd.service on"
+
+mutable_files="
+/var/lib/nfs/etab
+/var/lib/nfs/rmtab
+/var/lib/nfs/xtab
+/var/lib/nfs/state"
+
 make_dirs="
 /var/lib/nfs/v4recovery 	0755    root    root
 /var/lib/nfs/sm 		0750    root    root
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 06ac4be15b1..e14fe1944d5 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,14 +1,12 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
 version=1.2.6
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
 --with-statedir=/var/lib/nfs --enable-libmount-mount
 --without-tcp-wrappers --enable-ipv6 --sbindir=/usr/sbin"
-conf_files="/etc/idmapd.conf"
 depends="rpcbind"
-systemd_services="rpc-idmapd.service on rpc-statd.service on"
 subpackages="$pkgname-server"
 makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel
 librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel
@@ -23,9 +21,11 @@ long_desc="
  The $pkgname package provides client utilities for the linux kernel
  implementation of NFS - Network File System."
 
+conf_files="/etc/idmapd.conf"
+
 make_dirs="
-/var/lib/nfs/rpc_pipefs 0755	root	root
-/var/lib/nfs/sm 	0750	root	root"
+/var/lib/nfs/rpc_pipefs	0755	root	root
+/var/lib/nfs/sm		0750	root	root"
 
 pre_install() {
 	# Makefile doesn't seem to create it!