From f8fd4f21ae3e0d62c9802b87a80fa3b509fabad1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 7 Jul 2012 22:11:10 +0200 Subject: [PATCH] nfs-utils: split server stuff to -server subpkg. --- srcpkgs/nfs-utils-server | 1 + srcpkgs/nfs-utils/files/idmapd.conf | 2 +- srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d | 1 + srcpkgs/nfs-utils/files/proc-fs-nfsd.mount | 8 +++++ srcpkgs/nfs-utils/files/rpc-mountd.service | 2 +- srcpkgs/nfs-utils/nfs-utils-server.rshlibs | 6 ++++ srcpkgs/nfs-utils/nfs-utils-server.template | 35 ++++++++++++++++++++ srcpkgs/nfs-utils/nfs-utils.rshlibs | 2 -- srcpkgs/nfs-utils/template | 27 +++++++-------- 9 files changed, 65 insertions(+), 19 deletions(-) create mode 120000 srcpkgs/nfs-utils-server create mode 100644 srcpkgs/nfs-utils/files/proc-fs-nfsd.mount create mode 100644 srcpkgs/nfs-utils/nfs-utils-server.rshlibs create mode 100644 srcpkgs/nfs-utils/nfs-utils-server.template diff --git a/srcpkgs/nfs-utils-server b/srcpkgs/nfs-utils-server new file mode 120000 index 00000000000..82a7ac49404 --- /dev/null +++ b/srcpkgs/nfs-utils-server @@ -0,0 +1 @@ +nfs-utils \ No newline at end of file diff --git a/srcpkgs/nfs-utils/files/idmapd.conf b/srcpkgs/nfs-utils/files/idmapd.conf index b1b23afe946..acc158b2846 100644 --- a/srcpkgs/nfs-utils/files/idmapd.conf +++ b/srcpkgs/nfs-utils/files/idmapd.conf @@ -7,7 +7,7 @@ Domain = localdomain [Mapping] Nobody-User = nobody -Nobody-Group = nobody +Nobody-Group = nogroup [Translation] diff --git a/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d b/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d index f558f87175c..e2cf56c0dc6 100644 --- a/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d +++ b/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d @@ -1,3 +1,4 @@ d /var/lib/nfs/rpc_pipefs 0755 root root - d /var/lib/nfs/v4recovery 0755 root root - +d /var/lib/nfs/sm 0750 root root - d /etc/exports.d 0750 root root - diff --git a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount b/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount new file mode 100644 index 00000000000..3e807e4bebd --- /dev/null +++ b/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=RPC Pipe File System +DefaultDependencies=no + +[Mount] +What=sunrpc +Where=/proc/fs/nfsd +Type=rpc_pipefs diff --git a/srcpkgs/nfs-utils/files/rpc-mountd.service b/srcpkgs/nfs-utils/files/rpc-mountd.service index 16ce6636c0c..d8e444298b7 100644 --- a/srcpkgs/nfs-utils/files/rpc-mountd.service +++ b/srcpkgs/nfs-utils/files/rpc-mountd.service @@ -5,7 +5,7 @@ Requires=rpcbind.service nfsd.service [Service] Type=forking -ExecStart=/usr/sbin/rpc.mount +ExecStart=/usr/sbin/rpc.mountd [Install] WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/nfs-utils-server.rshlibs b/srcpkgs/nfs-utils/nfs-utils-server.rshlibs new file mode 100644 index 00000000000..f04da7e82f8 --- /dev/null +++ b/srcpkgs/nfs-utils/nfs-utils-server.rshlibs @@ -0,0 +1,6 @@ +libc.so.6 +libblkid.so.1 +libtirpc.so.1 +libdevmapper.so.1.02 +libgssglue.so.1 +libnfsidmap.so.0 diff --git a/srcpkgs/nfs-utils/nfs-utils-server.template b/srcpkgs/nfs-utils/nfs-utils-server.template new file mode 100644 index 00000000000..348733396ae --- /dev/null +++ b/srcpkgs/nfs-utils/nfs-utils-server.template @@ -0,0 +1,35 @@ +# Template file for 'nfs-utils-server'. +# +short_desc="Network File System utilities -- Server" +long_desc=" + This package contains utilities to administer the Linux kernel + implementation of NFS (Network File System) servers." + +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" + +do_install() { + vmove etc/exports etc + for f in exportfs rpc.mountd rpc.nfsd blkmapd rpc.svcgssd; do + vmove usr/sbin/${f} usr/sbin + [ "$f" = "blkmapd" ] && continue + vmove usr/share/man/man8/${f}.8 usr/share/man/man8 + done + for f in mountd nfsd blkmapd svcgssd; do + vmove usr/share/man/man8/${f}.8 usr/share/man/man8 + done + vmove usr/share/man/man5 usr/share/man + vmove usr/share/man/man7 usr/share/man + vmove var/lib/nfs var/lib + for f in blkmapd exportfs nfsd rpc-mountd rpc-svcgssd; do + vmove lib/systemd/system/${f}.service lib/systemd/system + done + vmove lib/systemd/system/proc-fs-nfsd.mount lib/systemd/system +} diff --git a/srcpkgs/nfs-utils/nfs-utils.rshlibs b/srcpkgs/nfs-utils/nfs-utils.rshlibs index ac6cefd6706..0d1b7032bac 100644 --- a/srcpkgs/nfs-utils/nfs-utils.rshlibs +++ b/srcpkgs/nfs-utils/nfs-utils.rshlibs @@ -1,10 +1,8 @@ libc.so.6 -libblkid.so.1 libtirpc.so.1 libcap.so.2 libevent-2.0.so.5 libnfsidmap.so.0 -libdevmapper.so.1.02 libgssglue.so.1 libkrb5.so.3 libcom_err.so.2 diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 4db03efd773..373bdc49693 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,35 +1,32 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.2.6 -homepage="http://nfs.sourceforge.net" -distfiles="http://downloads.sf.net/nfs/$pkgname-$version.tar.bz2" +revision=2 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/exports /etc/idmapd.conf" +conf_files="/etc/idmapd.conf" depends="rpcbind" -makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel libcap-devel mit-krb5-devel" -revision=1 -short_desc="Network File System utilities" +subpackages="$pkgname-server" +makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel +librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel +libcap-devel mit-krb5-devel" +short_desc="Network File System client utilities" maintainer="Juan RP " license="GPL-2" +homepage="http://nfs.sourceforge.net" +distfiles="http://downloads.sf.net/nfs/$pkgname-$version.tar.bz2" checksum=70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83 long_desc=" - The $pkgname package provides a daemon for the kernel NFS server and - related tools, which provides a much higher level of performance than the - traditional Linux NFS server used by most users." + The $pkgname package provides client utilities for the linux kernel + implementation of NFS - Network File System." # systemd services systemd_services=" -exportfs.service on -nfsd.service on rpc-gssd.service on rpc-idmapd.service on -rpc-mountd.service on -rpc-statd.service on -rpc-svcgssd.service on -blkmapd.service on" +rpc-statd.service on" pre_install() { # Makefile doesn't seem to create it!