From 8e423982134cdf1cc9c15972a896328a885287b1 Mon Sep 17 00:00:00 2001
From: Eric Thibodeau <kyron@neuralbs.com>
Date: Fri, 18 Jul 2008 09:10:34 -0400
Subject: Switch to AuFS, USE nonfs4 	AuFS module usage imlpies we're
 switching back to mainstream gentoo-sources 	nonfs4 already existed and is
 used by nfs-utils...we'll tag along

---
 overlay/sys-cluster/beowulf-head/Manifest          |  2 +-
 .../beowulf-head/beowulf-head-0.1.ebuild           | 23 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'overlay')

diff --git a/overlay/sys-cluster/beowulf-head/Manifest b/overlay/sys-cluster/beowulf-head/Manifest
index 73bd738..11d3bca 100644
--- a/overlay/sys-cluster/beowulf-head/Manifest
+++ b/overlay/sys-cluster/beowulf-head/Manifest
@@ -1,3 +1,3 @@
 AUX cluster.conf 2393 RMD160 2ccb24e8f2cb83d8a002fc239d0be6bb7968ed4d SHA1 ad4cc8ff8b8f2f4270755f387228efb0cc63c048 SHA256 660478b6763cc3c6190541bb46d5d17a01a5e366ac8ce84551d1ae31f2eb1673
-EBUILD beowulf-head-0.1.ebuild 5078 RMD160 a267e0bd75bb68af982d7d5057de0cc68182033c SHA1 c1d2e0d6676dc6f64a4f1d53a3730c5ab631e15c SHA256 956f9e30b09008736f56abb708c1d89f2ee656af62d684724b881a0d01157097
+EBUILD beowulf-head-0.1.ebuild 5149 RMD160 4747156babd1ee0fe75e6a216eb830b11cda764c SHA1 c937e4817983dcc20283f51e84b3913f2eaac69e SHA256 1c222782d7003355e165df72706813c62cd6f48145dbcda122d35c890ecfc2c4
 MISC ChangeLog 101 RMD160 d735719ccc09237e68e4e984eb5451000b06c382 SHA1 79098d1e8ae451f0430d363da6b717966ade6e78 SHA256 8dd010e2772026c4a6b86839842931b99c85c44a5e9f380864cc275b55587ac2
diff --git a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
index 1d4507e..a24b77f 100644
--- a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
+++ b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="autofs nfs4"
+IUSE="autofs nonfsv4"
 
 DEPEND=""
 RDEPEND="net-nds/ldap-auth
@@ -96,15 +96,16 @@ pxe_conf()
 	mkdir -p ${TFTPROOT}/pxelinux.cfg
 
 	cat > ${TFTPROOT}/pxelinux.cfg/default <<-EOF
-	prompt 1
-	timeout 50
-	say Press F1 for boot profiles, default is $PROFNAME in 5 seconds...
+	#prompt 1
+	#timeout 50
+	#say Press F1 for boot profiles, default is $PROFNAME in 5 seconds...
 	F1 BootProfiles
 	default $PROFNAME
 
 	label $PROFNAME
 	  kernel ${BOOTPATH}/kernel
-	  append ip=dhcp nfsroot=${CLUSTER_ETH_IP}:${NFSROOT},hard,intr init=/boot/stateless.sh 
+	#important: AuFS only supports NFSv3
+	  append ip=dhcp nfsroot=${CLUSTER_ETH_IP}:${NFSROOT},hard,intr,nfsvers=3 init=/boot/stateless.sh unionmod=aufs
 
 	label local
 	  localboot 0
@@ -133,22 +134,22 @@ nfs_root_conf()
 	# Yes, this could be looped on RO and RW...but that wouldn't be more redable
 	for I in $ROEXPORTS
 	do
-		if use nfs4 ; then
+		if use nonfs4 ; then
+			echo "${I} $NETADDR/$SUBNET(ro,$NFSEPORTOPTS)" >> ${ROOT}/etc/exports
+		else
 			mkdir -p ${NFSROOT}/${I}
 			mount -o bind ${I} ${NFSROOT}/${I}
-		else
-			echo "${I} $NETADDR/$SUBNET(ro,$NFSEPORTOPTS)" >> ${ROOT}/etc/exports
 		fi
 		use autofs && echo "${I/\/} -ro,$NFSMOUNTOPTS $CLUSTER_ETH_Ir:${I}" >> ${NFSROOT}/etc/autofs/auto.nfs
 	done
 
 	for I in $RWEXPORTS
 	do
-		if use nfs4 ; then
+		if use nonfs4 ; then
+			echo "${I} $NETADDR/$SUBNET(rw,$NFSEPORTOPTS)" >> ${ROOT}/etc/exports
+		else
 			mkdir -p ${NFSROOT}/${I}
 			mount -o bind ${I} ${NFSROOT}/${I}
-		else
-			echo "${I} $NETADDR/$SUBNET(rw,$NFSEPORTOPTS)" >> ${ROOT}/etc/exports
 		fi
 		use autofs && echo "${I/\/} -ro,$NFSMOUNTOPTS $CLUSTER_ETH_Ir:${I}" >> ${NFSROOT}/etc/autofs/auto.nfs
 	done
-- 
cgit v1.2.3-65-gdbad