xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-31 08:41:18 +00:00
Code Issues Releases Wiki Activity

Bug #4721 makentp -a didn't work on sles11.3

Browse Source
This commit is contained in:
Casandra Qiu
2015-07-02 14:28:19 -04:00
parent d4e1383e68
commit f0b3125e0b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/makentp.pm
View File

@@ -324,9 +324,9 @@ sub process_request {
my $cmd;
if ($os =~ /sles/) {
if (-f "/usr/sbin/rcntpd") {
$cmd = "rcntpd ntptimeset";
$cmd = "/usr/sbin/rcntpd ntptimeset";
} elsif (-f "/usr/sbin/rcntp") {
$cmd = "rcntp ntptimeset";
$cmd = "/usr/sbin/rcntp ntptimeset";
} else {
$cmd = "sntp -P no -r $ntp_master";
}

4
xCAT/postscripts/setupntp
View File

@@ -111,9 +111,9 @@ restrict 127.0.0.1" >>$conf_file
#ntpdate program is deprecated on SuSE
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
if [ -f /usr/sbin/rcntpd ]; then
cmd="rcntpd ntptimeset"
cmd="/usr/sbin/rcntpd ntptimeset"
elif [ -f /usr/sbin/rcntp ]; then
cmd="rcntp ntptimeset"
cmd="/usr/sbin/rcntp ntptimeset"
else
cmd="sntp -P no -r $ntp_master"
fi