Fix bug 30486 by refraining from overwriting /var/lib/nfs/*

3 files changed, 29 insertions, 7 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 147c171d7a1d..d9026a88a1dd 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.30 2004/01/14 22:53:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.31 2004/01/15 22:18:10 agriffis Exp $
+
+  15 Jan 2004; Aron Griffis <agriffis@gentoo.org> nfs-utils-1.0.6.ebuild:
+  Fix bug 30486 by refraining from overwriting /var/lib/nfs/*
 
   14 Jan 2004; Martin Holzer <mholzer@gentoo.org> files/nfs.confd:
   removing quota entry from conf.d
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 7e9fd948347c..e7e0dc2309ea 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,10 +1,10 @@
-MD5 aecaaca866129116ce3175943a74a415 ChangeLog 4554
-MD5 c986f85c39c93b6efacae1080034a771 nfs-utils-1.0.5-r1.ebuild 1939
-MD5 93c66f0b0f19e79f74db6c3f8810f6f7 nfs-utils-1.0.6.ebuild 1918
+MD5 7298c5973562df0f8a349d8538948612 ChangeLog 4692
+MD5 b3bd413a53fa22ed5a89a499f453b9c8 nfs-utils-1.0.6.ebuild 2550
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
-MD5 3219e53cb07ef64536526153158b7ab2 files/digest-nfs-utils-1.0.5-r1 67
+MD5 c986f85c39c93b6efacae1080034a771 nfs-utils-1.0.5-r1.ebuild 1939
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6 67
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
-MD5 f8a4929a63ec37847ed3e67c96cb5a76 files/nfs-2 4753
 MD5 d5d28d5c015b22e7c0d6b1d35ab5baff files/nfs.confd 265
 MD5 e8946ae3996c9629651da1b252fb9836 files/nfsmount 1166
+MD5 3219e53cb07ef64536526153158b7ab2 files/digest-nfs-utils-1.0.5-r1 67
+MD5 f8a4929a63ec37847ed3e67c96cb5a76 files/nfs-2 4753
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild
index a09eb9958176..b0d702e6c6ae 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild,v 1.8 2004/01/14 22:53:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.6.ebuild,v 1.9 2004/01/15 22:18:10 agriffis Exp $
 
 IUSE="tcpd"
 
@@ -34,6 +34,12 @@ src_install() {
 	make install install_prefix=${D} MANDIR=${D}/usr/share/man \
 		|| die "Failed to install"
 
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	mkdir -p ${D}/usr/lib/nfs
+	mv ${D}/var/lib/nfs/* ${D}/usr/lib/nfs
+	keepdir /var/lib/nfs
+
 	# Install some client-side binaries in /sbin
 	mkdir ${D}/sbin
 	mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin
@@ -52,6 +58,18 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Install default xtab and friends if there's none existing.
+	# In src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  This fixes
+	# bug 30486
+	local f
+	for f in ${ROOT}/usr/lib/nfs/*; do
+		[[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
+		cp -a ${f} ${ROOT}/var/lib/nfs/
+	done
+
+	echo
 	einfo "NFS V2 and V3 servers now default to \"sync\" IO if ${P}"
 	einfo "(or later) is installed."
 	einfo "More info at ${HOMEPAGE} (see questions 5, 12, 13, and 14)."
@@ -61,6 +79,7 @@ pkg_postinst() {
 	ewarn "export list, thus assuming the default behavior, a warning will"
 	ewarn "be generated at export time."
 	echo
+
 	# Running depscan since we introduced /etc/init.d/{portmap,nfs}
 	/etc/init.d/depscan.sh
 }