[arch-commits] Commit in nfs-utils/repos (3 files)

[Tobias Powalowski]

    Date: Wednesday, June 17, 2009 @ 02:28:52
  Author: tpowa
Revision: 42613

Merged revisions 42612 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/nfs-utils/trunk

........
  r42612 | tpowa | 2009-06-17 08:28:18 +0200 (Mi, 17 Jun 2009) | 1 line
  
  upgpkg: nfs-utils 1.2.0-2
........

Modified:
  nfs-utils/repos/testing-x86_64/	(properties)
  nfs-utils/repos/testing-x86_64/PKGBUILD
  nfs-utils/repos/testing-x86_64/nfs-utils.install

-------------------+
 PKGBUILD          |    2 +-
 nfs-utils.install |   40 +++++++++++++++++-----------------------
 2 files changed, 18 insertions(+), 24 deletions(-)


Property changes on: nfs-utils/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /nfs-utils/trunk:1-42562
   + /nfs-utils/trunk:1-42612

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-06-17 06:28:18 UTC (rev 42612)
+++ testing-x86_64/PKGBUILD	2009-06-17 06:28:52 UTC (rev 42613)
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'

Modified: testing-x86_64/nfs-utils.install
===================================================================
--- testing-x86_64/nfs-utils.install	2009-06-17 06:28:18 UTC (rev 42612)
+++ testing-x86_64/nfs-utils.install	2009-06-17 06:28:52 UTC (rev 42613)
@@ -1,38 +1,32 @@
 ## arg 1:  the new package version
 post_install() {
-  cat << 'EOM'
-  
-  ==>
+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 NFS; for NFSv4, refer to
-  ==> http://wiki.archlinux.org/index.php/NFSv4
-
-  ==>  If you plan on using NFSv4, in /etc/conf.d/nfs-common.conf set:
-  ==>  1) NEED_IDMAPD="yes" to start rpc.idmapd - on clients & server.
-  ==>     rpc.idmapd needs to be properly configured; edit at least the
-  ==>     Domain line in /etc/idmapd.conf.
-  ==>  2) NEED_GSSD="yes" to start rpc.gssd (GSS authentication) - only on clients.
-  ==>  3) Add "rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs 0 0" to /etc/fstab.
-  ==>     If not mounted when the init script nfs-common starts it tries to mount the
-  ==>     filesystem automatically (if rpc.idmapd or rpc.gssd is needed);
-  ==>     see /etc/conf.d/nfs-common.conf for extended configuration options.
-
-  ==> Only on server /etc/conf.d/nfs-server.conf set:
-  ==>  1) add "nfsd /proc/fs/nfsd nfsd -o rw,nodev,noexec,nosuid 0 0" to /etc/fstab.
-  ==>     If not mounted when the init script nfs-server starts it tries to mount the
-  ==>     filesystem automatically; see /etc/conf.d/nfs-server.conf for extended
-  ==>     configuration options.
-  ==>  2) NEED_SVCGSSD="yes" to start rpc.svcgssd (GSS authentication) - on server
-    
+  ==> http://wiki.archlinux.org/index.php/NFSv4   
 EOM
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
+cat << 'EOM'
+  ==> IMPORTANT NFS UTILS CHANGES:
+  ==> This is a rather big 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-sever
+  ==>
+  ==> 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
 }