Changeset e1ed2a7b for fedd


Ignore:
Timestamp:
Mar 10, 2014 4:21:30 PM (5 years ago)
Author:
Ted Faber <faber@…>
Branches:
master
Children:
a2ca699
Parents:
7862660 (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' of git://fedd.deterlab.net/fedd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/desktop_access.py

    r7862660 re1ed2a7b  
    418418            print >>f, 'sleep 60; done'
    419419            print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
    420                     '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s &') % \
     420                    '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s --use_file &') % \
    421421                    (port, self.ssh_identity, peer, my_addr)
    422422            # This should give the tap a a chance to come up
Note: See TracChangeset for help on using the changeset viewer.