[arch-commits] Commit in nfs-utils/trunk (20 files)

Tobias Powalowski tpowa at archlinux.org
Wed Apr 25 12:02:49 EDT 2012


    Date: Wednesday, April 25, 2012 @ 12:02:49
  Author: tpowa
Revision: 157199

upgpkg: nfs-utils 1.2.5-4

readd fixed systemd support

Added:
  nfs-utils/trunk/nfs-utils.conf
  nfs-utils/trunk/nfsd.service
  nfs-utils/trunk/proc-fs-nfsd.mount
  nfs-utils/trunk/rpc-gssd.service
  nfs-utils/trunk/rpc-idmapd.service
  nfs-utils/trunk/rpc-mountd.service
  nfs-utils/trunk/rpc-statd.service
  nfs-utils/trunk/rpc-svcgssd.service
Modified:
  nfs-utils/trunk/PKGBUILD
  nfs-utils/trunk/var-lib-nfs-rpc_pipefs.mount
Deleted:
  nfs-utils/trunk/nfs-blkmap.service
  nfs-utils/trunk/nfs-lock.preconfig
  nfs-utils/trunk/nfs-lock.service
  nfs-utils/trunk/nfs-secure-server.preconfig
  nfs-utils/trunk/nfs-secure-server.service
  nfs-utils/trunk/nfs-secure.service
  nfs-utils/trunk/nfs-server.postconfig
  nfs-utils/trunk/nfs-server.preconfig
  nfs-utils/trunk/nfs-server.service
  nfs-utils/trunk/proc-fs-nfsd.mount

------------------------------+
 PKGBUILD                     |   72 ++++++++++++++++++-----------------------
 nfs-blkmap.service           |   12 ------
 nfs-lock.preconfig           |   20 -----------
 nfs-lock.service             |   18 ----------
 nfs-secure-server.preconfig  |    7 ---
 nfs-secure-server.service    |   14 -------
 nfs-secure.service           |   12 ------
 nfs-server.postconfig        |   18 ----------
 nfs-server.preconfig         |   10 -----
 nfs-server.service           |   21 -----------
 nfs-utils.conf               |    1 
 nfsd.service                 |   16 +++++++++
 proc-fs-nfsd.mount           |   16 ++++-----
 rpc-gssd.service             |   12 ++++++
 rpc-idmapd.service           |   12 ++++++
 rpc-mountd.service           |   12 ++++++
 rpc-statd.service            |   12 ++++++
 rpc-svcgssd.service          |   12 ++++++
 var-lib-nfs-rpc_pipefs.mount |    5 +-
 19 files changed, 119 insertions(+), 183 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-25 14:06:29 UTC (rev 157198)
+++ PKGBUILD	2012-04-25 16:02:49 UTC (rev 157199)
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -24,22 +24,39 @@
 	idmapd.conf
 	start-statd.patch
         nfs
-	nfs-server.service
-        nfs-server.postconfig
-        nfs-server.preconfig
-        nfs-blkmap.service
-        nfs-secure-server.service
-        nfs-secure-server.preconfig
-        nfs-lock.service
-        nfs-lock.preconfig
-        nfs-secure.service
+	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
-	var-lib-nfs-rpc_pipefs.mount
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch)
+	nfs-utils.conf)
 install=nfs-utils.install
+md5sums=('8395ac770720b83c5c469f88306d7765'
+         'dd0d65fc6e8f422fa12520813098264b'
+         'f73f197a16b02c3e248488ec35c4cf43'
+         'e619f18354ff958ed624d05d08853d8f'
+         '9cef69bc686cc5dcac23fbb51450747d'
+         'ff585faf410a62c4333a027c50b56bae'
+         'eb4f4027fab6fc1201f1ca04f5954c76'
+         'e9144277a89a620d9bc80413158a7d27'
+         'f5e7bba09a46c5c5d7007cac6eff9df5'
+         '7674106eaaa4c149bccd4f05fe3604e9'
+         '4f4827dfc93008dfadd0a530ad0872b2'
+         '38855936dc55a5afe37d84edc0f11066'
+         '8d888de677a217c5e5f7244a2e3a2d3a'
+         'e05705d9ccccaeaeb1ecaee20adc05bc'
+         'd7df7bc311fd95c5b80017dd1741570d'
+         '2e72ee082cba5d3ec6f51d2a105664da'
+         '5d33d2e754fd37280365b287603bac90'
+         '1cd65909fa0983047f3f06a3ab352401'
+         '02a34835aa077146a90eb7d191e612d0'
+         '8ac484023d786766d287ccbe878ae4ba')
 
-
 build() {
   cd $srcdir/${pkgname}-${pkgver}
   patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
@@ -76,34 +93,9 @@
   for i in ${srcdir}/*.{service,mount}; do
     install -D -m 644 $i "$pkgdir/"usr/lib/systemd/system/$(basename $i)
   done
-  install -D -m 755 ../nfs-server.preconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-server.preconfig
-  install -D -m 755 ../nfs-server.postconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-server.postconfig
-  install -D -m 755 ../nfs-lock.preconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-lock.preconfig
-  install -D -m 755 ../nfs-secure-server.preconfig "$pkgdir/"usr/lib/nfs-utils/scripts/nfs-secure-server.preconfig
+  install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
   # directories
   mkdir "$pkgdir/"etc/exports.d
   mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
   mkdir "$pkgdir/"var/lib/nfs/v4recovery
 }
-md5sums=('8395ac770720b83c5c469f88306d7765'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         'f5e7bba09a46c5c5d7007cac6eff9df5'
-         '630a8ae10036bd1ffc6b6780fcd43403'
-         '956d5b8a9476cedc9fec322b9635a169'
-         '44c6bc21fca29b37de5cc689c3166ad1'
-         '23551447a1a4505ebc4e4919c08f142a'
-         'ff803f282aa2532c016ed149f9579d2f'
-         'c2995ec2e6e0158f15b01f9e20ce706b'
-         '218837aa129989146de8cbbf7c95ee5c'
-         '6a6e8befc9700d9f93949b7e12f38fa4'
-         '864178f2e13e077c76eec1003b4f662a'
-         '8f1b5282795895c9b8ce8430d20cdda6'
-         '4cb9d4277577c9e93e347e5855501e33'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')

Deleted: nfs-blkmap.service
===================================================================
--- nfs-blkmap.service	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-blkmap.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,12 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-Wants=var-lib-nfs-rpc_pipefs.mount
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/nfs
-ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
-
-[Install]
-WantedBy=multi-user.target

Deleted: nfs-lock.preconfig
===================================================================
--- nfs-lock.preconfig	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-lock.preconfig	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/nfs
-
-# Make sure nfs module is loaded
-/sbin/modprobe -q nfs
-
-# Make sure lockd is loaded
-/sbin/modprobe -q lockd $LOCKDARG
-
-# See if the kernel lockd should start up 
-# listening on a particular port
-#
-if [ -n "$LOCKD_TCPPORT" ]; then 
-		/sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
-fi
-if [ -n "$LOCKD_UDPPORT" ]; then
-		/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
-fi
-

Deleted: nfs-lock.service
===================================================================
--- nfs-lock.service	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-lock.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,18 +0,0 @@
-[Unit]
-Description=NFS file locking service.
-Requires=rpcbind.service network.target
-After=network.target named.service rpcbind.service
-Wants=remote-fs-pre.target
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/conf.d/nfs
-ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-lock.preconfig
-ExecStart=/usr/sbin/rpc.statd $STATDARG
-# Make sure lockd's ports are reset
-ExecStopPost=-/sbin/sysctl -w fs.nfs.nlm_tcpport=0 fs.nfs.nlm_udpport=0
-
-[Install]
-WantedBy=multi-user.target

Deleted: nfs-secure-server.preconfig
===================================================================
--- nfs-secure-server.preconfig	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-secure-server.preconfig	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/nfs
-
-# Make sure rpcsec_gss_krb5 module is loaded
-/sbin/modprobe -q rpcsec_gss_krb5
-

Deleted: nfs-secure-server.service
===================================================================
--- nfs-secure-server.service	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-secure-server.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Secure NFS Server
-Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
-After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service 
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/nfs
-ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-secure-server.preconfig
-ExecStart=/usr/sbin/rpc.svcgssd $RPCSVCGSSDARGS
-
-[Install]
-WantedBy=multi-user.target
-

Deleted: nfs-secure.service
===================================================================
--- nfs-secure.service	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-secure.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Secure NFS
-Requires=var-lib-nfs-rpc_pipefs.mount
-After=syslog.target var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS
-
-[Install]
-WantedBy=multi-user.target

Deleted: nfs-server.postconfig
===================================================================
--- nfs-server.postconfig	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-server.postconfig	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/nfs
-
-# Tell idmapd the server is up and running
-/usr/bin/pkill -HUP rpc.idmapd
-
-#
-# Enabled the RDMA server support if configured to do so.
-# 
-# Load the module and  then enable the server to listen 
-# on the given port
-if [ -n "$RDMA_PORT" ]; then 
-	/sbin/modprobe svcrdma
-	echo "rdma $RDMA_PORT" > /proc/fs/nfsd/portlist
-fi
-
-exit 0

Deleted: nfs-server.preconfig
===================================================================
--- nfs-server.preconfig	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-server.preconfig	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/nfs
-
-# Set v4 grace period if requested
-if [ -n "$NFSD_V4_GRACE" ]; then
-	echo "$NFSD_V4_GRACE" > /proc/fs/nfsd/nfsv4gracetime
-fi
-
-exit 0

Deleted: nfs-server.service
===================================================================
--- nfs-server.service	2012-04-25 14:06:29 UTC (rev 157198)
+++ nfs-server.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,21 +0,0 @@
-[Unit]
-Description=NFS Server
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
-After=network.target named.service rpcbind.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/nfs
-ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-server.preconfig
-ExecStartPre=-/usr/sbin/rpc.rquotad $RPCRQUOTADOPTS
-ExecStartPre=/usr/sbin/exportfs -r
-ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS ${RPCNFSDCOUNT}
-ExecStartPost=/usr/sbin/rpc.mountd $RPCMOUNTDOPTS
-ExecStartPost=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS
-ExecStartPost=-/usr/lib/nfs-utils/scripts/nfs-server.postconfig
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -f
-
-[Install]
-WantedBy=multi-user.target
-

Added: nfs-utils.conf
===================================================================
--- nfs-utils.conf	                        (rev 0)
+++ nfs-utils.conf	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1 @@
+nfs

Added: nfsd.service
===================================================================
--- nfsd.service	                        (rev 0)
+++ nfsd.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS server
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStartPost=/usr/sbin/exportfs -a
+ExecStop=/usr/sbin/rpc.nfsd 0
+ExecStopPost=/usr/sbin/exportfs -a -u
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

Deleted: proc-fs-nfsd.mount
===================================================================
--- proc-fs-nfsd.mount	2012-04-25 14:06:29 UTC (rev 157198)
+++ proc-fs-nfsd.mount	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=nfsd

Added: proc-fs-nfsd.mount
===================================================================
--- proc-fs-nfsd.mount	                        (rev 0)
+++ proc-fs-nfsd.mount	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPC Pipe File System 
+DefaultDependencies=no
+
+[Mount]
+What=sunrpc
+Where=/proc/fs/nfsd
+Type=rpc_pipefs

Added: rpc-gssd.service
===================================================================
--- rpc-gssd.service	                        (rev 0)
+++ rpc-gssd.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,12 @@
+[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
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target

Added: rpc-idmapd.service
===================================================================
--- rpc-idmapd.service	                        (rev 0)
+++ rpc-idmapd.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFSv4 ID-name mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS
+
+[Install]
+WantedBy=multi-user.target

Added: rpc-mountd.service
===================================================================
--- rpc-mountd.service	                        (rev 0)
+++ rpc-mountd.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFSv2/3 Mount Daemon
+After=rpcbind.service nfsd.service
+Requires=rpcbind.service nfsd.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target

Added: rpc-statd.service
===================================================================
--- rpc-statd.service	                        (rev 0)
+++ rpc-statd.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFSv2/3 Network Status Monitor Daemon
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/sbin/rpc.statd $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target

Added: rpc-svcgssd.service
===================================================================
--- rpc-svcgssd.service	                        (rev 0)
+++ rpc-svcgssd.service	2012-04-25 16:02:49 UTC (rev 157199)
@@ -0,0 +1,12 @@
+[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/sbin/rpc.svcgssd $SVCGSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target

Modified: var-lib-nfs-rpc_pipefs.mount
===================================================================
--- var-lib-nfs-rpc_pipefs.mount	2012-04-25 14:06:29 UTC (rev 157198)
+++ var-lib-nfs-rpc_pipefs.mount	2012-04-25 16:02:49 UTC (rev 157199)
@@ -1,8 +1,7 @@
 [Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
+Description=RPC pipe filesystem
 
 [Mount]
-What=sunrpc
+What=rpc_pipefs
 Where=/var/lib/nfs/rpc_pipefs
 Type=rpc_pipefs



More information about the arch-commits mailing list