NFSv4 provisionning

4 files changed, 30 insertions, 31 deletions

diff --git a/catalyst/livecd/2008.0/kconfig/livecd-2.6.24.config b/catalyst/livecd/2008.0/kconfig/livecd-2.6.24.config
index 5096a13..256261b 100644
--- a/catalyst/livecd/2008.0/kconfig/livecd-2.6.24.config
+++ b/catalyst/livecd/2008.0/kconfig/livecd-2.6.24.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24-gentoo-r7
-# Thu Jun 26 17:20:56 2008
+# Mon Jul 14 21:14:04 2008
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -444,7 +444,6 @@ CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_TUNNEL=m
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_NETLABEL is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -797,7 +796,7 @@ CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NBD=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
@@ -1251,9 +1250,6 @@ CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
 # CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_DMA_AND_PIO_MODE is not set
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_B43=m
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2320,25 +2316,25 @@ CONFIG_JBD=y
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
+CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=y
+CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
 CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=y
+CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_SECURITY=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
-CONFIG_GFS2_FS=y
-CONFIG_GFS2_FS_LOCKING_NOLOCK=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_NOLOCK=m
 CONFIG_GFS2_FS_LOCKING_DLM=m
 CONFIG_OCFS2_FS=y
 CONFIG_OCFS2_DEBUG_MASKLOG=y
@@ -2415,21 +2411,18 @@ CONFIG_SYSV_FS=m
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V3 is not set
 CONFIG_NFS_V4=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
-# CONFIG_ROOT_NFS is not set
+CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
@@ -2567,12 +2560,8 @@ CONFIG_EARLY_PRINTK=y
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=n
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
-# CONFIG_SECURITY_SELINUX is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
diff --git a/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec b/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec
index 7f4817a..c64ce64 100644
--- a/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec
+++ b/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec
@@ -111,6 +111,8 @@ stage4/packages:
     app-admin/eselect-cblas
     app-admin/eselect-blas
     app-admin/eselect-lapack
+# let's try NBD for rootfs
+	sys-block/nbd
 
 # A fsscript is simply a shell script that is copied into the chroot of the stage4
 # after the kernel(s) and any external modules have been compiled and is 
diff --git a/overlay/sys-cluster/beowulf-head/Manifest b/overlay/sys-cluster/beowulf-head/Manifest
index 3039ace..73bd738 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 4881 RMD160 9db75cb18d1c8fbf52e81a00f51431e9690ce122 SHA1 5644e5faa3d60cb9e69fbac8a8038810887e0ecf SHA256 191f869a079c2446d13609574b9a2caf333461d83d525f1e0ccca91e7e97490a
+EBUILD beowulf-head-0.1.ebuild 5078 RMD160 a267e0bd75bb68af982d7d5057de0cc68182033c SHA1 c1d2e0d6676dc6f64a4f1d53a3730c5ab631e15c SHA256 956f9e30b09008736f56abb708c1d89f2ee656af62d684724b881a0d01157097
 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 1e9961e..1d4507e 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"
+IUSE="autofs nfs4"
 
 DEPEND=""
 RDEPEND="net-nds/ldap-auth
@@ -46,7 +46,7 @@ dnsmasq_conf()
 	cat > ${ROOT}/etc/dnsmasq.conf <<-EOF	
 
 	# Public interface
-	except-interface=$ETH
+	except-interface=$PUBETH
 
 	# Set up the local-only domain
 	local=/${LOCALDOMAINNAME}/
@@ -66,8 +66,6 @@ dnsmasq_conf()
 	enable-tftp
 	tftp-root=${TFTPROOT}
 
-	dhcp-authoritative
-	
 	### Node definitions, this could be in a separate file
 	# Turn on the DHCP server, pass out addresses from $IPSTART to $IPSTOP
 	# with subnet mask of $SUBNET with a 12-hour lease
@@ -106,7 +104,7 @@ pxe_conf()
 
 	label $PROFNAME
 	  kernel ${BOOTPATH}/kernel
-	  append ip=dhcp nfsroot=rootserver:${NFSROOT},hard,intr init=/boot/stateless.sh 
+	  append ip=dhcp nfsroot=${CLUSTER_ETH_IP}:${NFSROOT},hard,intr init=/boot/stateless.sh 
 
 	label local
 	  localboot 0
@@ -130,18 +128,28 @@ nfs_root_conf()
 		ewarn "You might have to perform"
 	fi
 
-	echo "${NFSROOT} $NETADDR/$SUBNET(ro,$NFSEPORTOPTS)" > ${ROOT}/etc/exportfs
+	echo "${NFSROOT} $NETADDR/$SUBNET(ro,$NFSEPORTOPTS,fsid=0)" > ${ROOT}/etc/exports
 
 	# Yes, this could be looped on RO and RW...but that wouldn't be more redable
 	for I in $ROEXPORTS
 	do
-		echo "${I} $NETADDR/$SUBNET(ro,$NFSEPORTOPTS)" >> ${ROOT}/etc/exportfs
+		if use nfs4 ; then
+			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
-		echo "${I} $NETADDR/$SUBNET(rw,$NFSEPORTOPTS)" >> ${ROOT}/etc/exportfs
+		if use nfs4 ; then
+			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