diff --git a/srcpkgs/nfs-utils/files/exportfs.service b/srcpkgs/nfs-utils/files/exportfs.service deleted file mode 100644 index 5acec33771b..00000000000 --- a/srcpkgs/nfs-utils/files/exportfs.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Export filesystems over NFS -After=nfsd.service -Requires=nfsd.service - -[Service] -ExecStart=/usr/sbin/exportfs -ar -ExecStop=/usr/sbin/exportfs -au -ExecReload=/usr/sbin/exportfs -ar -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/nfs-utils-server.template b/srcpkgs/nfs-utils/nfs-utils-server.template index 348733396ae..0b999f45102 100644 --- a/srcpkgs/nfs-utils/nfs-utils-server.template +++ b/srcpkgs/nfs-utils/nfs-utils-server.template @@ -8,12 +8,8 @@ long_desc=" depends="rpcbind" replaces="nfs-utils<1.2.6_2" conf_files="/etc/exports" -systemd_services=" -exportfs.service on -nfsd.service on -rpc-mountd.service on -rpc-svcgssd.service on -blkmapd.service on" +mutable_files="/var/lib/nfs/etab /var/lib/nfs/rmtab /var/lib/nfs/xtab" +systemd_services="nfsd.service on rpc-mountd.service on" do_install() { vmove etc/exports etc diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 373bdc49693..55d0d5420a3 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,13 +1,14 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.2.6 -revision=2 +revision=3 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 @@ -22,12 +23,6 @@ long_desc=" The $pkgname package provides client utilities for the linux kernel implementation of NFS - Network File System." -# systemd services -systemd_services=" -rpc-gssd.service on -rpc-idmapd.service on -rpc-statd.service on" - pre_install() { # Makefile doesn't seem to create it! vmkdir sbin