Final commit before deadline...see diffs ;)

5 files changed, 32 insertions, 11 deletions

diff --git a/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup b/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup
index 8d95ca8..233b89e 100755
--- a/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup
+++ b/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup
@@ -160,7 +160,11 @@ portageq envvar USE | grep -q pbs
 
 if [[ $? == 0 ]]; then
 	einfo "Setting up torque on $HOSTNAME and in $NFSROOT"
-	emerge --config =sys-cluster/torque-2.3.3
+	USE=server emerge --config =sys-cluster/torque-2.3.3
+	# if mom is not started on the master node, listing it in nodes doesn't hurt it and
+	# makes sure the file exists
+	echo $(hostname) >> $PBS_SERVER_HOME/server_priv/nodes
+	/etc/init.d/pbs_server start
 	USE=-server ROOT=$NFSROOT emerge --config =sys-cluster/torque-2.3.3
 fi
 
@@ -171,3 +175,10 @@ einfo "Setting up auth on the $NFSROOT"
 USE=-authmaster ROOT="$NFSROOT" emerge --config =net-nds/ldap-auth-0.1
 
 [[ $? == 0 ]] && einfo "Once you have nodes going, restart Torque (pbs_server)"
+if [[ $1 == "--test" ]]; then
+	echo 'Using --test implies the following:
+- root password is "test" and can log on (passwordless) onto nodes !!!!
+- ldap admin password is "default" !!!!(again)
+- eth1 is the cluster\'s NIC and is set to 10.0.0.1/24
+- eth0 is the public nic
+- all defaults in .config files get used'
diff --git a/catalyst/livecd/2008.0/specs/amd64/livecd-stage1.spec b/catalyst/livecd/2008.0/specs/amd64/livecd-stage1.spec
index 17ab415..fa63839 100644
--- a/catalyst/livecd/2008.0/specs/amd64/livecd-stage1.spec
+++ b/catalyst/livecd/2008.0/specs/amd64/livecd-stage1.spec
@@ -40,7 +40,7 @@ livecd/use:
 	tk
 
 livecd/packages:
-	app-accessibility/brltty
+#	app-accessibility/brltty
 	app-admin/hddtemp
 	app-admin/ide-smart
 	app-admin/logrotate
diff --git a/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh b/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh
index 4f9b7c9..63ab733 100644
--- a/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh
+++ b/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh
@@ -63,7 +63,10 @@ openrc_diskless_setup() {
 	change_opt 'wipe_tmp="NO"' /etc/conf.d/bootmisc
 
 	# /etc/conf.d/net
-	echo 'dhcpcd_eth0="--renew --persistent"' >> /etc/conf.d/net
+	echo '# server side DNSMASQ_USER_CLASS0 will contain the processor count'
+	echo 'dhcpcd_eth0="--renew --persistent --userclass=$(c=0; for i in /sys/devices/system/cpu/cpu[0-9]*; do ((c++)); done; echo $c)"' >> /etc/conf.d/net
+# The above is an alternative which doesn't use wc, thus no superficial process spawning.
+#	echo 'dhcpcd_eth0="--persistent --userclass=$(ls -1d /sys/devices/system/cpu/cpu[0-9]* | /usr/bin/wc -l)"' >> /etc/conf.d/net
 	
 	# Set clock to localtime as default
 	
diff --git a/overlay/sys-cluster/beowulf-head/Manifest b/overlay/sys-cluster/beowulf-head/Manifest
index f043833..011025e 100644
--- a/overlay/sys-cluster/beowulf-head/Manifest
+++ b/overlay/sys-cluster/beowulf-head/Manifest
@@ -1,9 +1,9 @@
 AUX c3-add 686 RMD160 ede4fc8bb832046607e79f831942a3d0708cbcab SHA1 cb496f8137065e2559caea38d932f3a07340d170 SHA256 e0195e7b6dcc77465b768c746825bcfec0157c3a6e5e0e4e1f1336521ecef0d6
 AUX c3-del 104 RMD160 18b49c1a929b0fc08912692f41ec8df1313c940d SHA1 b7d66c89d64fcb7a32a8d62cb147dcaf2994c3e7 SHA256 f4e3e9431c40b50f1596816eaa4d1f760ab840ae555d5fa2a76a7672d0432dfa
-AUX cluster.conf 2393 RMD160 2ccb24e8f2cb83d8a002fc239d0be6bb7968ed4d SHA1 ad4cc8ff8b8f2f4270755f387228efb0cc63c048 SHA256 660478b6763cc3c6190541bb46d5d17a01a5e366ac8ce84551d1ae31f2eb1673
+AUX cluster.conf 2621 RMD160 b26b26c4482be2d921fa8b1ddb99f42ea3120bf9 SHA1 3d1a2926c977472e2ace5a3b831681e4def390ad SHA256 56fe9f2e51f6a27467721b850fdf1e68ad3d3df484bfa096e8841cae5a044d54
 AUX dnsmasq-2.4-conf 1552 RMD160 08dae8ff1cd345acedb4cbbb819f8ccf35211b8b SHA1 e770ba62ca66b61cd84409bbb22433b1dfcf9ff3 SHA256 f2b63d6fc8558c84e79b5f172c4057354bdfe000aae19f8aa1857655259a6b7f
-AUX node-manager 1574 RMD160 bda5378e456c567947504fc95a3db4163c214517 SHA1 d1ca1142b31019b9edc3827dc5c9c9ad7b1ed996 SHA256 fd2f94e4f58aea91f0d11ea87f6f18f160782721956455f3892dae5e435827db
-AUX torque-add 183 RMD160 30eae769ed05dabdc144d1e8259fd14f1f97a152 SHA1 dc2ece4b1a890557193b7dfad28e8696af7529c2 SHA256 d4ea4b509d47044f2e445b0fd36beb64eb35143ac62ccbaa4ac8905b8a12746e
+AUX node-manager 2021 RMD160 d8a3e5a650651dc7c2f87b63902197a1077705be SHA1 6ba6423cb1677c5be41a3ec252a021828498fa00 SHA256 2392e038e4d82945a98592e396d6de970940ad9d18ae5bc008ebee3b52dab7b9
+AUX torque-add 479 RMD160 35a63ae8069a2f8966356d9379723684c7ff9299 SHA1 4de2f9c60a569e822377e737d3b5c1ccf53cc2ed SHA256 695c44a2cb81d1b81b35138fbe8ba0ea3aedf9e3e68d96f0e7f87f745f272794
 AUX torque-del 132 RMD160 bc1e0a9ccc6ce20630003f7372d62bdb705b9187 SHA1 c735f03fb6715ab601cb84f4fbc92be78ce43575 SHA256 c455764846f192930625721958532d3cee64aa75d9d83a37b67544e4c7bdee64
-EBUILD beowulf-head-0.1.ebuild 7273 RMD160 966e7332fcfdac3560b29e7e8be7dff866630c2a SHA1 911e996fae639424abec535b05e256091f13e61c SHA256 ef70453c432338f42ba9b6ccb7aa4a0a591fef5c9a7935cfd516761d73fe9eae
+EBUILD beowulf-head-0.1.ebuild 7412 RMD160 6e2dfebb5dbf981ee6a41337c5e9a89bd686e567 SHA1 78b2c53f4e73b48a449d31a1e304289c8ac540b9 SHA256 1960ca36f06269557a8d39b8373bda595a7b2d91eab0a08a02aea46552b6736b
 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 6643bde..a27c7b7 100644
--- a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
+++ b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild
@@ -207,13 +207,20 @@ pkg_setup() {
 
 src_unpack(){
 	mkdir -p ${S}
+
 	cp ${FILESDIR}/node-manager ${S}/node-manager || die "Som ting Wong"
-	sed -ie "s:%%MODULESPATH:$MODULESPATH:" ${S}/node-manager 
+	sed -e "s:%%MODULESPATH:$MODULESPATH:" -i ${S}/node-manager 
 	if use beep ; then
-		sed -ie "s:%%BEEPS:true:" ${S}/node-manager
+		sed -e "s:%%BEEPS:true:" -i ${S}/node-manager
 	else
-		sed -ie "s:%%BEEPS:false:" ${S}/node-manager
+		sed -e "s:%%BEEPS:false:" -i ${S}/node-manager
+	fi
+
+	if use pbs ; then
+		cp ${FILESDIR}/torque-* ${S}/
+		sed -e "s:%%CONFPATH/%%CONFIG_FILE:$CONFPATH/$CONFIG_FILE:" -i ${S}/torque-add
 	fi
+
 }
 
 src_install(){
@@ -228,7 +235,7 @@ src_install(){
 	dodir   ${MODULESPATH}
 	exeinto ${MODULESPATH}
 	doexe   ${FILESDIR}/c3-* 
-	use pbs && doexe ${FILESDIR}/torque-* 
+	use pbs && doexe ${S}/torque-* 
 
 	elog "You need to edit ${CONFPATH}/${CONFIG_FILE} to your likings"
 	elog "Once you are done, set CONFIG_OK=\"yes\" in there and"