xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Do not stop tftp service in xcatd when restarting xcad service

Browse Source 
close-issue: #2463
This commit is contained in:
chenglch 2017-02-07 16:50:34 +08:00
parent 085e2d45c5
commit 7f069d3f48
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/sbin/xcatd
View File

@ -139,6 +139,7 @@ Getopt::Long::Configure("pass_through");
use Storable qw(dclone);
use POSIX qw(WNOHANG setsid :errno_h);
my $pidfile;
my $reload;
my $foreground;
GetOptions(
'pidfile|p=s' => \$pidfile,
@ -1278,6 +1279,7 @@ $SIG{USR2} = sub {
if ($listener) {
unlink("/var/run/xcat/mainservice.pid"); close($listener); $quit = 1; $listener = 0;
$udpctl = 0;
$reload = 1;
xCAT::MsgUtils->message("S", "xcatd main service $$ quiescing");
}
};
@ -1552,7 +1554,9 @@ if ($dbmaster) {
# stop the monitoring process
xCAT_monitoring::monitorctrl::stop($$);
stop_tftp_service();
if (! $reload) {
stop_tftp_service();
}
sub stop_tftp_service {
eval {