Commit 6acf59a0 authored by Mike Hibler's avatar Mike Hibler
Browse files

Merge remote branch 'origin'

parents 660f4265 19b040d6
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2003-2010 University of Utah and the Flux Group.
# Copyright (c) 2003-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -510,6 +510,12 @@ Phase "ssh", "Allowing root ssh", sub {
AppendToFileFatal($SSHD_CONFIG,
"PermitRootLogin yes",
"Protocol 2,1");
# HUP the server so the changes take effect
if (-r "/var/run/sshd.pid") {
my $dpid = `cat /var/run/sshd.pid`;
chomp($dpid);
ExecQuiet("kill -HUP $dpid");
}
};
Phase "dotssh", "Making root's .ssh directory", sub {
DoneIfExists("/root/.ssh");
......
......@@ -1057,6 +1057,12 @@ Phase "ssh", "Allowing root ssh", sub {
AppendToFileFatal($SSHD_CONFIG,
"PermitRootLogin yes",
"Protocol 2,1");
# HUP the server so the changes take effect
if (-r "/var/run/sshd.pid") {
my $dpid = `cat /var/run/sshd.pid`;
chomp($dpid);
ExecQuiet("kill -HUP $dpid");
}
};
Phase "dotssh", "Making root's .ssh directory", sub {
DoneIfExists("/root/.ssh");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment