Context Navigation

r73e0a61	r64e774d
17	17	my $iface_file = "/var/emulab/boot/ifmap";
18	18	my $ssh = "/usr/bin/ssh";
	19	my $scp = "/usr/bin/scp";
19	20	my $ssh_port = 22;
20	21	my $use_file;
…	…
29	30	'interfaces=s' => \$iface_file,
30	31	'ssh=s' => \$ssh,
	32	'scp=s' => \$scp,
31	33	'ssh_port=s' => \$ssh_port,
32	34	'use_file' => \$use_file,
…	…
48	50	gateway_lib::wait_for_port($peer, 22, 60*60) \|\|
49	51	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);
	52	my $coord_fn = "$fedkit_dir/etc/prep_done";
	53	print "Making sure ssh permissions are reset (fetching $coord_fn)\n";
	54	gateway_lib::testcmd_repeat("$scp -o \"StrictHostKeyChecking no\" " .
	55	"-i $ssh_privkey $peer:$coord_fn /tmp", 5*60);
53	56
54	57	if (my $f = new IO::File($iface_file)) {

fedkit/prep_gateway.pl

r1d91791f	r64e774d
37	37
38	38	if ($uname =~ /Linux/) {
39		~~# Install bridging software if not present~~
40		~~system('/usr/bin/yum -y install bridge-utils');~~
41	39	# Restart sshd with tunnel params
42	40	gateway_lib::set_sshd_params(
…	…
45	43	gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
46	44	if $ssh_pubkey;
	45	# Install bridging software if not present
	46	system('/usr/bin/yum -y install bridge-utils');
47	47	}
48	48	elsif ($uname =~ /FreeBSD/ ){
…	…
71	71	if $peer && $router;
72	72	}
	73	my $coord_fn = "$fed_dir/etc/prep_done";
	74	my $coord_file = new IO::File(">$coord_fn") \|\| die "Cannot open $coord_fn";
	75
	76	print $coord_file `date`;
	77	$coord_file->close();
73	78
74	79	exit(0);