Changeset f8fa72b for fedkit/combo.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/combo.pl (modified) (4 diffs)

fedkit/combo.pl

@@ -18 +18 @@
 my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
+my $ssh_port = 22;
 my @ports;
 my $use_file;
@@ -32 +33 @@
     'port=s' => \@ports,
     'active' => \$active, 
+    'ssh_port=s' => \$ssh_port,
     'use_file' => \$use_file,
 );
@@ -37 +39 @@
 exit(20) unless GetOptions(%opts);
 
-gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
-    if $use_file;
+if ($use_file) {
+    gateway_lib::read_config(gateway_lib::config_filename(), \%opts)
+}
 
 my $tunnelparam = $tunnelip ? '--tunnelip' : '';
@@ -50 +53 @@
         "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
         " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
-        "--ssh=$ssh --interfaces=$iface_file");
+        "--ssh_port=$ssh_port --ssh=$ssh --interfaces=$iface_file");
     exit(20) if $?;