Changeset 64e774d


Ignore:
Timestamp:
Aug 26, 2010 9:28:12 AM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • fedkit/active_config.pl

    r208797c r64e774d  
    1717my $iface_file = "/var/emulab/boot/ifmap";
    1818my $ssh = "/usr/bin/ssh";
     19my $scp = "/usr/bin/scp";
    1920my $ssh_port = 22;
    2021my $use_file;
     
    2930    'interfaces=s' => \$iface_file,
    3031    'ssh=s' => \$ssh,
     32    'scp=s' => \$scp,
    3133    'ssh_port=s' => \$ssh_port,
    3234    'use_file' => \$use_file,
     
    4850gateway_lib::wait_for_port($peer, 22, 60*60) ||
    4951    die "ssh never came up on $peer\n";
    50 print "Making sure ssh permissions are reset\n";
    51 gateway_lib::testcmd_repeat("$ssh -o \"StrictHostKeyChecking no\" " .
    52     "-i $ssh_privkey $peer ls", 5*60);
     52my $coord_fn = "$fedkit_dir/etc/prep_done";
     53print "Making sure ssh permissions are reset (fetching $coord_fn)\n";
     54gateway_lib::testcmd_repeat("$scp -o \"StrictHostKeyChecking no\" " .
     55    "-i $ssh_privkey $peer:$coord_fn /tmp", 5*60);
    5356
    5457if (my $f = new IO::File($iface_file)) {
  • fedkit/prep_gateway.pl

    r208797c r64e774d  
    3737
    3838if ($uname =~ /Linux/) {
    39     # Install bridging software if not present
    40     system('/usr/bin/yum -y install bridge-utils');
    4139    # Restart sshd with tunnel params
    4240    gateway_lib::set_sshd_params(
     
    4543    gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
    4644        if $ssh_pubkey;
     45    # Install bridging software if not present
     46    system('/usr/bin/yum -y install bridge-utils');
    4747}
    4848elsif ($uname =~ /FreeBSD/ ){
     
    7171        if $peer && $router;
    7272}
     73my $coord_fn = "$fed_dir/etc/prep_done";
     74my $coord_file = new IO::File(">$coord_fn") || die "Cannot open $coord_fn";
     75
     76print $coord_file `date`;
     77$coord_file->close();
    7378
    7479exit(0);
Note: See TracChangeset for help on using the changeset viewer.