Changes in fedd/federation/desktop_access.py [51d3aa0:7862660]

File:

• fedd/federation/desktop_access.py (modified) (1 diff)

fedd/federation/desktop_access.py

@@ -415 +415 @@
             # a file this end can access into its local file system.  Try once
             # a minute.
-            print >>f,'while ! /usr/bin/scp -o "StrictHostKeyChecking no" -i %s %s:/usr/local/federation/etc/prep_done /dev/null; do' % (self.ssh_identity, peer)
+            print >>f,'while ! /usr/bin/scp -P %s -o "StrictHostKeyChecking no" -i %s %s:/usr/local/federation/etc/prep_done /dev/null; do' % (port, self.ssh_identity, peer)
             print >>f, 'sleep 60; done'
             print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
-                    '-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 &') % \
+                    '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s &') % \
                     (port, self.ssh_identity, peer, my_addr)
             # This should give the tap a a chance to come up