Changeset d501c38 for fedkit

Timestamp:

Sep 18, 2007 2:57:54 PM (17 years ago)

Author:

Kevin Lahey <lahey@…>

Branches:

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

Children:

fe459d0

Parents:

c8c45ee

Message:

Tweaks to ensure that the tap interface is up before we configure the
tunnel.

File:

• fedkit/fed-tun.pl (modified) (4 diffs)

fedkit/fed-tun.pl

@@ -21 +21 @@
 use IO::File;
 
+my $IFCONFIG = "/sbin/ifconfig";
 my $TMCC = "/usr/local/etc/emulab/tmcc";
 my $SSH = "/usr/local/bin/ssh";
@@ -140 +141 @@
     my @SSHCMD;
 
+    # If we are just setting up a control net connection, just fire up
+    # ssh with the null command, and hang loose.
+
+    if ($type eq "control") {
+        system("$SSH $ssh_port_fwds -Nno \"StrictHostKeyChecking no\" $opts{'peer'} &"); #or die "Failed to run ssh";
+
+        exit;
+    }
+
     open(IFFILE, "/var/emulab/boot/ifmap") || die "couldn't open ifmap\n";
     while (<IFFILE>) {
@@ -158 +168 @@
 
         my $check = <$SSHCMD[$count]>;  # Make sure something ran...
+        print "Got line [$check] from remote side\n" if ($debug);
 
         &setup_bridging($tun, $bridge, $iface, $addr);
@@ -199 +210 @@
     my ($tun, $bridge, $iface, $addr) = @_;
 
-    print "Got new $tun\n" if ($debug);
+    print "Waiting to see if new iface $tun is up\n" if ($debug);
+
+    do {
+        sleep 1;
+        system("$IFCONFIG $tun");
+    } until (!$?);
+
     print "setting up $bridge with $iface and nuking $addr\n" if ($debug);