diff options
21 files changed, 106 insertions, 426 deletions
diff --git a/abs/core/nfs-utils/PKGBUILD b/abs/core/nfs-utils/PKGBUILD index b94b840..2bcce5c 100644 --- a/abs/core/nfs-utils/PKGBUILD +++ b/abs/core/nfs-utils/PKGBUILD @@ -1,111 +1,111 @@ -# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $ +# $Id$ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> # Contributor: abelstr <abel@pinklf.eu> # Contributor: Marco Lima <cipparello gmail com> -pkgname=nfs-utils -pkgver=1.2.9 +pkgbase=nfs-utils +pkgname=('nfs-utils' 'nfsidmap') +pkgver=2.3.1 pkgrel=1 -pkgdesc="Support programs for Network File Systems" -arch=('i686' 'x86_64') +arch=('x86_64') url='http://nfs.sourceforge.net' -license=('GPL') -backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') -makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite') -source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common.conf - nfs-server.conf - exports - idmapd.conf - nfs - nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch - rpc-gssd.service - rpc-mountd.service - rpc-svcgssd.service - rpc-idmapd.service - rpc-statd.service - nfsd.service - var-lib-nfs-rpc_pipefs.mount - proc-fs-nfsd.mount - blkmapd.service - nfs-utils.conf +makedepends=('libevent' 'sqlite') +# http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary +source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign} id_resolver.conf - start-statd.patch) -install=nfs-utils.install -optdepends=('sqlite: for nfsdcltrack usage') - + exports) +# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc +sha256sums=('96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5' + 'SKIP' + 'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102' + '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154') +validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson prepare() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - # fix /usr/bin in start-statd shell script - patch -Np1 -i ../start-statd.patch - #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch + cd ${pkgbase}-${pkgver} + + # fix hardcoded sbin path to our needs + sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am + autoreconf -vfi } build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs \ - --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ - --with-gssglue \ - --enable-mountconfig --with-start-statd=/usr/bin/start-statd - # move mount helpers to /usr/bin - sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile - # move osd_login to /usr/bin - sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile + cd ${pkgbase}-${pkgver} + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --enable-gss \ + --without-tcp-wrappers \ + --with-statedir=/var/lib/nfs \ + --enable-ipv6 \ + --enable-libmount-mount \ + --enable-mountconfig \ + --with-start-statd=/usr/bin/start-statd make } -package() { - cd $srcdir/${pkgname}-${pkgver} - # fix make install - make DESTDIR=$pkgdir install - - # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats} - - # Configuration - install -D -m 644 ../exports "$pkgdir/"etc/exports - install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs - install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf - # keyutils id_resolver #35463 - install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf - # systemd files - for i in ${srcdir}/*.{service,mount}; do - install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" +check() { + cd ${pkgbase}-${pkgver} + make -k check || /bin/true +} + +package_nfs-utils() { + + pkgdesc="Support programs for Network File Systems" + license=('GPL2') + + backup=(etc/{exports,nfs.conf,nfsmount.conf}) + depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper') + optdepends=('sqlite: for nfsdcltrack usage' + 'python: for nfsiostat and mountstats usage') + + cd ${pkgbase}-${pkgver} + make DESTDIR="$pkgdir" install + + install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf + install -D -m 644 nfs.conf "$pkgdir"/etc/nfs.conf + + for i in systemd/{*.service,*.mount,*.target}; do + install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$(basename $i) done - install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf - # directories - mkdir "$pkgdir/"etc/exports.d - mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery + install -d -m 755 "$pkgdir"/usr/share/doc/$pkgname + install -D -m 644 systemd/README "$pkgdir"/usr/share/doc/$pkgname/README.systemd + + # docs + install -m 644 {NEWS,README} "$pkgdir"/usr/share/doc/$pkgname/ + + # empty exports file + install -D -m 644 ../exports "$pkgdir"/etc/exports + + # config file for idmappers in newer kernels + install -D -m 644 ../id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf + + mkdir "$pkgdir"/etc/exports.d + mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs + mkdir "$pkgdir"/var/lib/nfs/v4recovery + + # nfsidmap cleanup + rm -vrf $pkgdir/usr/include #/nfsid* + rm -vrf $pkgdir/usr/lib/libnfsidmap* + rm -vrf $pkgdir/usr/lib/pkgconfig #/libnfsidmap.pc + rm -v $pkgdir/usr/share/man/{man3/nfs4_uid_to_name*,man5/idmapd.conf*} + rm -rf $pkgdir/usr/share/man/man3 } -md5sums=('18869d16db3f49c053f8c68eba3fe2e0' - 'f73f197a16b02c3e248488ec35c4cf43' - '9cef69bc686cc5dcac23fbb51450747d' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'f5e7bba09a46c5c5d7007cac6eff9df5' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2' - '6aeb4a80b2a5162f5951438474ea22f3' - 'ff95ad9275ef774e0a2ea8adfe55ee66' - '2e991f0e440b4809e22b6c7689544fc0' - '42d0088add3beab0284be1379391382b' - '60d82e2d2d19d21ceb72665e54bf913e' - '3bcc9901478f4f9ea0a03b67171c13e3' - '1cd65909fa0983047f3f06a3ab352401' - '8f1b5282795895c9b8ce8430d20cdda6' - '8f03e708b230619ffc2a799a48bffb53' - '8ac484023d786766d287ccbe878ae4ba' - 'bed57f7c3911af695ec7b469248c104a' - 'f8bb29c2ca1ce178e6371091a3e1090d') +package_nfsidmap() { + + pkgdesc="Library to help mapping IDs, mainly for NFSv4" + license=('GPL2') + backup=(etc/idmapd.conf) + depends=('libldap') + + cd ${pkgbase}-${pkgver} + make -C support DESTDIR="$pkgdir" install + # config file + install -D -m 644 support/nfsidmap/idmapd.conf "$pkgdir"/etc/idmapd.conf + # license + install -Dm644 support/nfsidmap/COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE +} diff --git a/abs/core/nfs-utils/blkmapd.service b/abs/core/nfs-utils/blkmapd.service deleted file mode 100644 index fa7ce39..0000000 --- a/abs/core/nfs-utils/blkmapd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=pNFS block layout mapping daemon -After=var-lib-nfs-rpc_pipefs.mount nfsd.service -Requires=var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -ExecStart=/usr/bin/blkmapd - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/exports b/abs/core/nfs-utils/exports index 8f4aac5..59dfa2e 100644 --- a/abs/core/nfs-utils/exports +++ b/abs/core/nfs-utils/exports @@ -1,15 +1,12 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. +# /etc/exports - exports(5) - directories exported to NFS clients # # Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# +# /srv/home hostname1(rw,sync) hostname2(ro,sync) # Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) +# /srv/nfs4 hostname1(rw,sync,fsid=0) # /srv/nfs4/home hostname1(rw,sync,nohide) # Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) +# /srv/nfs4 *(rw,sync,sec=krb5i,fsid=0) +# /srv/nfs4/home *(rw,sync,sec=krb5i,nohide) # +# Use `exportfs -arv` to reload. diff --git a/abs/core/nfs-utils/id_resolver.conf b/abs/core/nfs-utils/id_resolver.conf index 9c0fee3..6b1ea48 100644 --- a/abs/core/nfs-utils/id_resolver.conf +++ b/abs/core/nfs-utils/id_resolver.conf @@ -1 +1,9 @@ -create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file +# +# nfsidmap(5) - The NFS idmapper upcall program +# Summary: Used by NFSv4 to map user/group ids into +# user/group names and names into in ids +# Options: +# -v Increases the verbosity of the output to syslog +# -t timeout Set the expiration timer, in seconds, on the key +# +create id_resolver * * /usr/bin/nfsidmap %k %d diff --git a/abs/core/nfs-utils/idmapd.conf b/abs/core/nfs-utils/idmapd.conf deleted file mode 100644 index b1b23af..0000000 --- a/abs/core/nfs-utils/idmapd.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] - -Verbosity = 0 -Pipefs-Directory = /var/lib/nfs/rpc_pipefs -Domain = localdomain - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nobody - -[Translation] - -Method = nsswitch diff --git a/abs/core/nfs-utils/nfs b/abs/core/nfs-utils/nfs deleted file mode 100644 index 2d33cf3..0000000 --- a/abs/core/nfs-utils/nfs +++ /dev/null @@ -1,40 +0,0 @@ -# -# Optinal options passed to rquotad -RPCRQUOTADOPTS="" -# -# Optional arguments passed to in-kernel lockd -#LOCKDARG= -# TCP port rpc.lockd should listen on. -#LOCKD_TCPPORT=32803 -# UDP port rpc.lockd should listen on. -#LOCKD_UDPPORT=32769 -# -# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) -RPCNFSDARGS="" -# Number of nfs server processes to be started. -# The default is 8. -RPCNFSDCOUNT=8 -# Set V4 grace period in seconds -#NFSD_V4_GRACE=90 -# -# Optional arguments passed to rpc.mountd. See rpc.mountd(8) -RPCMOUNTDOPTS="" -# -# Optional arguments passed to rpc.statd. See rpc.statd(8) -STATDARG="" -# -# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) -RPCIDMAPDARGS="" -# -# Optional arguments passed to rpc.gssd. See rpc.gssd(8) -RPCGSSDARGS="" -# -# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) -RPCSVCGSSDARGS="" -# -# To enable RDMA support on the server by setting this to -# the port the server should listen on -#RDMA_PORT=20049 -# -# Optional arguments passed to blkmapd. See blkmapd(8) -BLKMAPDARGS="" diff --git a/abs/core/nfs-utils/nfs-common.conf b/abs/core/nfs-utils/nfs-common.conf deleted file mode 100644 index 12466b3..0000000 --- a/abs/core/nfs-utils/nfs-common.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Parameters to be passed to nfs-common (nfs clients & server) init script. -# - -# If you do not set values for the NEED_ options, they will be attempted -# autodetected; this should be sufficient for most people. Valid alternatives -# for the NEED_ options are "yes" and "no". - -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD="" - -# Options to pass to rpc.statd. -# See rpc.statd(8) for more details. -# N.B. statd normally runs on both client and server, and run-time -# options should be specified accordingly. -# STATD_OPTS="-p 32765 -o 32766" -STATD_OPTS="" - -# Options to pass to sm-notify -# e.g. SMNOTIFY_OPTS="-p 32764" -SMNOTIFY_OPTS="" - -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD="" - -# Options to pass to rpc.idmapd. -# See rpc.idmapd(8) for more details. -IDMAPD_OPTS="" - -# Do you want to start the gssd daemon? It is required for Kerberos mounts. -NEED_GSSD="" - -# Options to pass to rpc.gssd. -# See rpc.gssd(8) for more details. -GSSD_OPTS="" - -# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". -PIPEFS_MOUNTPOINT="" - -# Options used to mount rpc_pipefs filesystem; the default is "defaults". -PIPEFS_MOUNTOPTS="" diff --git a/abs/core/nfs-utils/nfs-server.conf b/abs/core/nfs-utils/nfs-server.conf deleted file mode 100644 index 581e263..0000000 --- a/abs/core/nfs-utils/nfs-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Parameters to be passed to nfs-server init script. -# - -# Options to pass to rpc.nfsd. -# See rpc.nfsd(8) for more details. -NFSD_OPTS="" - -# Number of servers to start up; the default is 8 servers. -NFSD_COUNT="" - -# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". -PROCNFSD_MOUNTPOINT="" - -# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". -PROCNFSD_MOUNTOPTS="" - -# Options for rpc.mountd. -# If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. -# See rpc.mountd(8) for more details. -MOUNTD_OPTS="" - -# Do you want to start the svcgssd daemon? It is only required for Kerberos -# exports. Valid alternatives are "yes" and "no"; the default is "no". -NEED_SVCGSSD="" - -# Options to pass to rpc.svcgssd. -# See rpc.svcgssd(8) for more details. -SVCGSSD_OPTS="" diff --git a/abs/core/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/abs/core/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60af..0000000 --- a/abs/core/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/abs/core/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/abs/core/nfs-utils/nfs-utils-1.1.4-no-exec.patch deleted file mode 100644 index ea50a21..0000000 --- a/abs/core/nfs-utils/nfs-utils-1.1.4-no-exec.patch +++ /dev/null @@ -1,15 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.2/utils/mount/mount.c -+++ nfs-utils-1.1.2/utils/mount/mount.c -@@ -381,10 +381,6 @@ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } -- if (access(mount_point, X_OK) < 0) { -- mount_error(NULL, mount_point, errno); -- return 1; -- } - - return 0; - } diff --git a/abs/core/nfs-utils/nfs-utils.conf b/abs/core/nfs-utils/nfs-utils.conf deleted file mode 100644 index 33c97b8..0000000 --- a/abs/core/nfs-utils/nfs-utils.conf +++ /dev/null @@ -1 +0,0 @@ -nfs diff --git a/abs/core/nfs-utils/nfs-utils.install b/abs/core/nfs-utils/nfs-utils.install deleted file mode 100644 index f6c72d9..0000000 --- a/abs/core/nfs-utils/nfs-utils.install +++ /dev/null @@ -1,32 +0,0 @@ -## arg 1: the new package version -post_install() { -cat << 'EOM' - ==> PLEASE NOTE: - ==> Extended configuration options for NFS (clients & server) are available in - ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf - ==> - ==> Please refer to http://wiki.archlinux.org/index.php/NFS - ==> for further information on NFS4; for NFSv3, refer to - ==> http://wiki.archlinux.org/index.php/NFSv3 -EOM -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then -cat << 'EOM' - ==> IMPORTANT NFS UTILS CHANGES: - ==> This is a rather important upgrade, you are going to have to change config files. - ==> /etc/rc.conf daemons changes: - ==> Change portmap to rpcbind - ==> Change nfslock to nfs-common - ==> Change nfsd to nfs-server - ==> - ==> Extended configuration options for NFS (clients & server) are available in: - ==> /etc/conf.d/nfs-common - ==> /etc/conf.d/nfs-server - ==> Please change them to your needs. -EOM - fi -} diff --git a/abs/core/nfs-utils/nfsd.service b/abs/core/nfs-utils/nfsd.service deleted file mode 100644 index d63e490..0000000 --- a/abs/core/nfs-utils/nfsd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=NFS server -After=rpcbind.service -Requires=rpcbind.service - -[Service] -Type=oneshot -EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT -ExecStartPost=/usr/bin/exportfs -a -ExecStop=/usr/bin/rpc.nfsd 0 -ExecStopPost=/usr/bin/exportfs -a -u -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/proc-fs-nfsd.mount b/abs/core/nfs-utils/proc-fs-nfsd.mount deleted file mode 100644 index e5ee6fb..0000000 --- a/abs/core/nfs-utils/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPC Pipe File System -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/proc/fs/nfsd -Type=nfsd diff --git a/abs/core/nfs-utils/rpc-gssd.service b/abs/core/nfs-utils/rpc-gssd.service deleted file mode 100644 index 182d9b7..0000000 --- a/abs/core/nfs-utils/rpc-gssd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=RPC GSS-API client-side daemon -After=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-idmapd.service b/abs/core/nfs-utils/rpc-idmapd.service deleted file mode 100644 index 1167daf..0000000 --- a/abs/core/nfs-utils/rpc-idmapd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=NFSv4 ID-name mapping daemon -After=var-lib-nfs-rpc_pipefs.mount nfsd.service -Requires=var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-mountd.service b/abs/core/nfs-utils/rpc-mountd.service deleted file mode 100644 index 7528884..0000000 --- a/abs/core/nfs-utils/rpc-mountd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFS Mount Daemon -After=rpcbind.service nfsd.service -Requires=rpcbind.service nfsd.service - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-statd.service b/abs/core/nfs-utils/rpc-statd.service deleted file mode 100644 index c2fd63b..0000000 --- a/abs/core/nfs-utils/rpc-statd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=NFSv2/3 Network Status Monitor Daemon -After=rpcbind.service -Requires=rpcbind.service -Before=remote-fs-pre.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/bin/rpc.statd $STATD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/rpc-svcgssd.service b/abs/core/nfs-utils/rpc-svcgssd.service deleted file mode 100644 index 876bad3..0000000 --- a/abs/core/nfs-utils/rpc-svcgssd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=RPC GSS-API server-side daemon -After=rpcbind.service -Requires=rpcbind.service - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/nfs-utils/start-statd.patch b/abs/core/nfs-utils/start-statd.patch deleted file mode 100644 index 6f6f119..0000000 --- a/abs/core/nfs-utils/start-statd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200 -+++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200 -@@ -4,6 +4,6 @@ - # /var/run/rpc.statd.pid). - # It should run statd with whatever flags are apropriate for this - # site. --PATH=/sbin:/usr/sbin -+PATH=/sbin:/usr/sbin:/usr/bin - exec rpc.statd --no-notify - diff --git a/abs/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/abs/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index 4bd440f..0000000 --- a/abs/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPC pipe filesystem - -[Mount] -What=rpc_pipefs -Where=/var/lib/nfs/rpc_pipefs -Type=rpc_pipefs |