Changeset 64e774d

Timestamp:

Aug 26, 2010 9:28:12 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

6f02be5

Parents:

208797c

Message:

More careful synchronization of reconfigured sshd's

Location:

fedkit

Files:

• active_config.pl (modified) (3 diffs)
• prep_gateway.pl (modified) (3 diffs)

fedkit/active_config.pl

@@ -17 +17 @@
 my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
+my $scp = "/usr/bin/scp";
 my $ssh_port = 22;
 my $use_file;
@@ -29 +30 @@
     'interfaces=s' => \$iface_file,
     'ssh=s' => \$ssh,
+    'scp=s' => \$scp,
     'ssh_port=s' => \$ssh_port,
     'use_file' => \$use_file,
@@ -48 +50 @@
 gateway_lib::wait_for_port($peer, 22, 60*60) || 
     die "ssh never came up on $peer\n";
-print "Making sure ssh permissions are reset\n";
-gateway_lib::testcmd_repeat("$ssh -o \"StrictHostKeyChecking no\" " .
-    "-i $ssh_privkey $peer ls", 5*60);
+my $coord_fn = "$fedkit_dir/etc/prep_done";
+print "Making sure ssh permissions are reset (fetching $coord_fn)\n";
+gateway_lib::testcmd_repeat("$scp -o \"StrictHostKeyChecking no\" " .
+    "-i $ssh_privkey $peer:$coord_fn /tmp", 5*60);
 
 if (my $f = new IO::File($iface_file)) {

fedkit/prep_gateway.pl

@@ -37 +37 @@
 
 if ($uname =~ /Linux/) {
-    # Install bridging software if not present
-    system('/usr/bin/yum -y install bridge-utils');
     # Restart sshd with tunnel params
     gateway_lib::set_sshd_params( 
@@ -45 +43 @@
     gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
         if $ssh_pubkey;
+    # Install bridging software if not present
+    system('/usr/bin/yum -y install bridge-utils');
 }
 elsif ($uname =~ /FreeBSD/ ){
@@ -71 +71 @@
         if $peer && $router;
 }
+my $coord_fn = "$fed_dir/etc/prep_done";
+my $coord_file = new IO::File(">$coord_fn") || die "Cannot open $coord_fn";
+
+print $coord_file `date`;
+$coord_file->close();
 
 exit(0);