3 files changed, 41 insertions, 14 deletions
diff --git a/overlay/net-nds/ldap-auth/Manifest b/overlay/net-nds/ldap-auth/Manifest
index cf71d8e..1d4e729 100644
--- a/overlay/net-nds/ldap-auth/Manifest
+++ b/overlay/net-nds/ldap-auth/Manifest
@@ -1,3 +1,3 @@
-AUX cluster_ldap_skel.conf 3842 RMD160 de4593c0dd3dddaf72d1c47f13353f03805abac6 SHA1 2a5684b4cd10fb24e20a484fbe13efc9169050c3 SHA256 31c275547ac260ec41a52f2b620a90625bf26cc2304090f0cf4aad6f5110f37f
-EBUILD ldap-auth-0.1.ebuild 13518 RMD160 714498bdca8368ae924b93fafc603cb63439ab30 SHA1 5e623dcbe98020a9af7ce3b4c2c45a9e9aec2c8a SHA256 52f9f8d7f27e1a80e87ba91c35e2136c60d1e5a576a22ed4b4e34001f475fc69
+AUX cluster_ldap_skel.conf 4069 RMD160 f383130b4b41aa901ba002572575898ad8328f75 SHA1 f2c8a0aa2d3d15458e09a8dfc801eca59cc6a505 SHA256 11fda02a86821caf073345ff22857e74f280a4a48dd8072cf352dae5a336881f
+EBUILD ldap-auth-0.1.ebuild 13598 RMD160 3b14c80e3ce44f49c77c80d9f02bfb27af5d61bd SHA1 4ccbeb998e35f1b5937d407e37f30ce8953c202e SHA256 5e1c16655d8b9c5ab99f64c86019a0255cc60396e8e14b75452f4d9b3739df6c
 MISC ChangeLog 96 RMD160 33378f096bd5ea216ab1105e8293de02bf385f3c SHA1 71bc3c85f819f3ac9f7a403bb7eb56a7f75bc0e3 SHA256 71b814def53b860a9afb5aee0eb35f95f6aa5302ebdb89455e2ca0ec3f7774a6
diff --git a/overlay/sys-cluster/beowulf-head/Manifest b/overlay/sys-cluster/beowulf-head/Manifest
index 624b088..618925d 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 5162 RMD160 c3ef0816cb2165489727773529fe2dc4f4e86b70 SHA1 c796f1d21f6eb0178f6fe6bfd9c8cb69b74028ac SHA256 c9bf21baeaddd5efbe766bf21d752c4196c69dea33f1c569873c9f856a7ac5ae
+EBUILD beowulf-head-0.1.ebuild 6118 RMD160 603098747d9f6364ebbf366db57aff0bc2ab2f02 SHA1 a7e7bfad77e95ab6a872ee34a4412c4e57255fb3 SHA256 7220faed9f98222b04e6aa182d2bb9a6539db5ea59756980c2b7ed3be0960cf4
 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 ba15430..bdc1252 100644
--- a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
+++ b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
@@ -17,7 +17,8 @@ RDEPEND="net-nds/ldap-auth
 	net-dns/dnsmasq
 	net-misc/sipcalc
 	net-fs/nfs-utils
-	sys-cluster/c3"
+	sys-cluster/c3
+	net-dns/openresolv"
 
 CONFPATH="/etc/gentoo"
 CONFIG_FILE="cluster.conf"
@@ -29,9 +30,11 @@ get_ip_config()
 	CLUSTER_ETH_IP="$(sipcalc ${CLUSTER_ETH} | egrep 'Host address\W*-' | cut -d- -f2)"
 	RANGE_START="$(sipcalc ${CLUSTER_ETH} | egrep 'Host address\W*-' | cut -d- -f2)"
 	IPSTART="${RANGE_START%.*}.$(( ${RANGE_START##*.} +1 ))"
-	IPSTOP="$(sipcalc ${CLUSTER_ETH} | egrep 'Usable range\W*-' | cut -d- -f3)"
-	SUBNET="$(sipcalc ${CLUSTER_ETH} | egrep 'Network mask\W*-' | cut -d- -f2)"
-	NETADDR="$(sipcalc ${CLUSTER_ETH} | egrep 'Network address' | cut -d- -f2)"
+	IPSTOP="$(   sipcalc ${CLUSTER_ETH} | egrep 'Usable range\W*-'    | cut -d- -f3)"
+	SUBNET="$(   sipcalc ${CLUSTER_ETH} | egrep 'Network mask\W*-'    | cut -d- -f2)"
+	NETADDR="$(  sipcalc ${CLUSTER_ETH} | egrep 'Network address'     | cut -d- -f2)"
+	NODECOUNT="$(sipcalc ${CLUSTER_ETH} | egrep 'Addresses in network'| cut -d- -f2)"
+
 	# We have to clean up the vars from spaces:
 	CLUSTER_ETH_IP=${CLUSTER_ETH_IP// }
 	RANGE_START=${RANGE_START// }
@@ -44,27 +47,36 @@ get_ip_config()
 dnsmasq_conf()
 {
 	cat > ${ROOT}/etc/dnsmasq.conf <<-EOF	
-
+	# For the sake of non-duplication of documentation, please view the dnsmasq manpage for a description of these options.
 	# Public interface
 	except-interface=$PUBETH
+	
+	# We are the authoritative DHCP server for this network
+	dhcp-authoritative
 
 	# Set up the local-only domain
-	local=/${LOCALDOMAINNAME}/
+	local=/${LOCALDOMAINNAME}/127.0.0.1
 	domain=$LOCALDOMAINNAME
 	expand-hosts
 
+	# We need the following to retain dhcp served resolution info:
+	resolv-file=/etc/dnsmasq-resolv.conf
+
 	# Some netiquette:
 	domain-needed
 	bogus-priv
 	
+	enable-tftp
+	tftp-root=${TFTPROOT}
+
 	# Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client
 	# probably doesn't support this...... (option 119)
 	dhcp-option=119,$LOCALDOMAINNAME
 	# Domain DNS name
 	dhcp-option=15,$LOCALDOMAINNAME
 
-	enable-tftp
-	tftp-root=${TFTPROOT}
+	# set the master node as the NTP server
+	dhcp-option=option:ntp-server,0.0.0.0
 
 	### Node definitions, this could be in a separate file
 	# Turn on the DHCP server, pass out addresses from $IPSTART to $IPSTOP
@@ -78,12 +90,12 @@ dnsmasq_conf()
 	# This tells the clients the hostname and IP of the TFTP server
 	dhcp-boot=${PXELINUX},$(hostname),$CLUSTER_ETH_IP
 
-	# We are the authoritative DHCP server for this network
-	dhcp-authoritative
-
 	# address and root path of NFS server
 	dhcp-option=17,$CLUSTER_ETH_IP:${NFSROOT}
 	
+	# The default is 150, which is quite low if one wants a cluster with more than 150 nodes.
+	dhcp-lease-max=$NODECOUNT
+
 	EOF
 }
 
@@ -156,6 +168,14 @@ nfs_root_conf()
 
 }
 
+resolv_conf()
+{
+	cat >> /etc/resolvconf/resolv.conf.d/base <<-EOF
+	search $LOCALDOMAINNAME
+	nameserver 127.0.0.1
+	EOF
+}
+
 parse_config()
 {
 	[[ -f ${1} ]] || die "${1} missing!!! re-emerge ${PF}"
@@ -186,6 +206,7 @@ pkg_config()
 	parse_config "${CONFPATH}/${CONFIG_FILE}"
 	get_ip_config
 	dnsmasq_conf
+	resolv_conf
 	pxe_conf
 	nfs_root_conf
 	
@@ -194,5 +215,11 @@ pkg_config()
 		rc-update add $I default
 		/etc/init.d/$I start
 	done
+	
+	elog "Since we just changed a resolvconf file, "
+	elog "it is required that your main NIC interface be restarted"
+	elog "or at least a renewal of dhcp be triggered."
+	elog 'ie: with dhcpcd one calls `dhcpcd -n eth0`'
+	elog "You will then want to restart dnsmasq."
 }