Changeset f8fa72b for fedkit/active_config.pl

Timestamp:

Mar 5, 2010 3:26:09 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

444790d

Parents:

c119839

Message:

More ProtoGENI accomodation

File:

• fedkit/active_config.pl (modified) (4 diffs)

fedkit/active_config.pl

@@ -17 +17 @@
 my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
-my $use_file;
+my $ssh_port = 22;
 
 my %opts = (
@@ -28 +28 @@
     'interfaces=s' => \$iface_file,
     'ssh=s' => \$ssh,
+    'ssh_port=s' => \$ssh_port,
     'use_file' => \$use_file,
 );
@@ -33 +34 @@
 exit(20) unless GetOptions(%opts);
 
-gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+gateway_lib::read_config(gateway_lib::config_filename(), \%opts)
     if $use_file;
 
@@ -56 +57 @@
             my ($iface, $addr) = ($1, $2);
 
-            my $cmd = "$ssh -w $ifnum:$ifnum -o \"Tunnel ethernet\" " . 
-                "-o \"StrictHostKeyChecking no\" -i $ssh_privkey " .
-                "$peer perl -I$fedkit_dir/lib $fedkit_dir/bin/setup_bridge.pl " .
-                "--tapno=$ifnum --dest=$addr &";
+            my $cmd = "$ssh -w $ifnum:$ifnum -p $ssh_port " . 
+                "-o \"Tunnel ethernet\" -o \"StrictHostKeyChecking no\" " .
+                "-i $ssh_privkey $peer perl -I$fedkit_dir/lib ".
+                "$fedkit_dir/bin/setup_bridge.pl --tapno=$ifnum --dest=$addr &";
             system($cmd);
             die if $?;