aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Thibodeau <kyron@neuralbs.com>2008-07-15 08:33:19 -0400
committerEric Thibodeau <kyron@neuralbs.com>2008-07-15 08:33:19 -0400
commit42024c1d646466864c13a61762ee707ccab931e0 (patch)
tree503dc828cf0d1f9f7c62e6fc286295fc312196ff /catalyst
parentSet a+x perm on cluster-setup script (diff)
downloadclustering-livecd-42024c1d646466864c13a61762ee707ccab931e0.tar.gz
clustering-livecd-42024c1d646466864c13a61762ee707ccab931e0.tar.bz2
clustering-livecd-42024c1d646466864c13a61762ee707ccab931e0.zip
Added --test to cluster-setup to speed up the dev cycle
Diffstat (limited to 'catalyst')
-rwxr-xr-xcatalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup19
1 files changed, 18 insertions, 1 deletions
diff --git a/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup b/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup
index 1af73e6..527d889 100755
--- a/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup
+++ b/catalyst/livecd/2008.0/overlay/usr/sbin/cluster-setup
@@ -53,6 +53,23 @@ einfo "Checking config files.."
done
}
+# speed up the dev cycle by automating some tasks:
+if [[ "$1" == "--test" ]]; then
+ ewarn
+ ewarn "Yeah...you know what you're doing right?"
+ ewarn "Warranty void if used ;)"
+ ewarn
+ cat > /etc/conf.d/net <<-EOF
+ # This network configuration was written by net-setup
+ config_eth1=( "10.0.0.1 broadcast 10.0.0.255 netmask 255.255.255.0" )
+ modules_eth1=( "!plug" )
+ EOF
+ /etc/init.d/net.eth1 restart
+ echo root:test | chpasswd
+ /etc/init.d/sshd start
+ sed -i -e's:CONFIG_OK="no":CONFIG_OK="yes":' /etc/gentoo/*
+fi
+
check_conf
aufs_mount
# After this, all paths should be ok (no need to use relative paths with ${CDROOT}
@@ -62,7 +79,7 @@ do_conf /etc/gentoo/ldap_auth.conf "emerge --config =net-nds/ldap-auth-0.1"
. /etc/gentoo/cluster.conf
einfo "Making sure $CLUSTER_ETH is configured correctly.."
-if [[ $CLUSTER_ETH =~ eth.* ]]; then
+if [[ "$CLUSTER_ETH" =~ eth.* && $1 != "--test" ]]; then
echo "The cluster's NIC is set as $CLUSTER_ETH with the following config:"
/sbin/ifconfig $CLUSTER_ETH
until [[ $ANS == "y" || $ANS == "n" ]]