Ignore:
Timestamp:
Mar 10, 2014 11:12:49 AM (11 years ago)
Author:
Ted Faber <faber@…>
Branches:
master
Children:
a2ca699
Parents:
26821ac (diff), dffa585 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into shared_nat

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedkit/setup_bridge.pl

    r26821ac r4a02274  
    1313my $fedkit_dir= "/usr/local/federation";
    1414my $perl = "/usr/bin/perl";
     15my $peer;
    1516my $use_file;
    1617my %opts = (
     
    1819    'addr=s' => \$addr,
    1920    'dest=s' => \$dest,
     21    'peer=s' => \$peer,
    2022    'use_file', \$use_file,
    2123);
    2224
    2325exit(20) unless GetOptions(%opts);
    24 gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
     26gateway_lib::read_config(gateway_lib::config_filename(), \%opts)
    2527    if $use_file;
    2628
     
    3436
    3537gateway_lib::bind_tap_to_iface($tapno, $iface);
     38gateway_lib::ping_peer($peer)
     39    if $peer;
    3640
    3741exit(0);
Note: See TracChangeset for help on using the changeset viewer.