Changeset b09f346

Timestamp:

Dec 15, 2008 10:19:47 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

fe157b9

Parents:

f3d72f7

Message:

a little defensive programming

Location:

fedkit

Files:

• fed-tun.pl (modified) (2 diffs)
• federate.sh (modified) (2 diffs)

fedkit/fed-tun.pl

@@ -370 +370 @@
 sub setup_tunnel_cfg {
     my (%opts) = @_;
-    my $tunnel_iface = "em0";   # XXX
+    #my $tunnel_iface = "em0";   # XXX
+    my $tunnel_iface = $opts{'interface'} || "em0";
     my $tunnel_ip;
     my $tunnel_mask;
@@ -410 +411 @@
     my $config_succeeded = 0;
     my $tries = 0;
-    my $max_retries = 30;
+    my $max_retries = 300;
 
     do {

fedkit/federate.sh

@@ -76 +76 @@
 SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $CONFIGDIR/client.conf`
 
+# If this is empty confusion reigns.  Set a default.
+if [-z "$SHARE" ]; then
+        SHARE="USERS"
+fi
+
 # XXX: modified seer daemon to read a config file.  Not in the tarfile yet.  If
 # we see one, and there's a /usr/seer/backend/daemon.py, replace that one with
@@ -93 +98 @@
 fi
 
-GWIP=`host -N 10 $GATEWAY | $PERL -ne 's/.* has address // && print;'`
+while [ -z "$GWIP"]; do
+        GWIP=`host -N 10 $GATEWAY | $PERL -ne 's/.* has address // && print;'`
+        echo "GWIP is $GWIP"
+        sleep 10
+done
 # Copy the global hostnames file into /etc/hosts so this node can address
 # others in the experiment on other testbeds.  The extra steps preserves teh