From ce9430d28040de02d3f3e31e1b8f17b804aa7e43 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 2 Jul 2015 14:58:53 +0800 Subject: [PATCH 1/9] Fix sourceforge bug #4691 Use a consistent log tag for xCAT log --- perl-xCAT/xCAT/MsgUtils.pm | 6 +++--- src/proxydhcp.c | 6 +----- xCAT-UI/lib/functions.php | 2 +- xCAT-UI/lib/srv_functions.php | 2 +- xCAT-server/lib/xcat/plugins/nodediscover.pm | 2 +- xCAT-server/sbin/proxydhcp-xcat | 2 +- xCAT-server/sbin/xcat_traphandler | 2 +- xCAT-server/sbin/xcatd | 6 +++--- xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl | 2 +- xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl | 2 +- xCAT/postscripts/confGang | 2 -- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/perl-xCAT/xCAT/MsgUtils.pm b/perl-xCAT/xCAT/MsgUtils.pm index 71b8ea4cd..0e9cd3028 100644 --- a/perl-xCAT/xCAT/MsgUtils.pm +++ b/perl-xCAT/xCAT/MsgUtils.pm @@ -470,7 +470,7 @@ sub message { # If they want this msg to also go to syslog, do that now eval { - openlog("xCAT", "nofatal,pid", "local4"); + openlog("xcat", "nofatal,pid", "local4"); if ($sev eq 'SE') { syslog("err", $rsp); } else { @@ -516,7 +516,7 @@ sub message { print $stdouterrf "Unable to open auditlog\n"; eval { - openlog("xCAT", "nofatal,pid", "local4"); + openlog("xcat", "nofatal,pid", "local4"); syslog("err", "Unable to write to auditlog"); closelog(); }; @@ -533,7 +533,7 @@ sub message { # error print $stdouterrf "Unable to open auditlog\n"; eval { - openlog("xCAT", "nofatal,pid", "local4"); + openlog("xcat", "nofatal,pid", "local4"); syslog("err", "Unable to open auditlog"); closelog(); }; diff --git a/src/proxydhcp.c b/src/proxydhcp.c index cc9a265a3..745707619 100644 --- a/src/proxydhcp.c +++ b/src/proxydhcp.c @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { if (strcmp(argv[i], "-V") == 0) { verbose = 1; setlogmask(LOG_UPTO(LOG_DEBUG)); - openlog("proxydhcp", LOG_NDELAY, LOG_LOCAL0); + openlog("xcat", LOG_NDELAY, LOG_LOCAL0); } } @@ -276,7 +276,3 @@ int main(int argc, char *argv[]) { if (verbose) { closelog();} } - - - - diff --git a/xCAT-UI/lib/functions.php b/xCAT-UI/lib/functions.php index 51827fc4e..a59e44eef 100644 --- a/xCAT-UI/lib/functions.php +++ b/xCAT-UI/lib/functions.php @@ -81,7 +81,7 @@ function submit_request($req, $skipVerify, $opts_array){ // Open syslog, include the process ID and also send the log to standard error, // and use a user defined logging mechanism - openlog("xCAT-UI", LOG_PID | LOG_PERROR, LOG_LOCAL0); + openlog("xcat", LOG_PID | LOG_PERROR, LOG_LOCAL0); // Open a socket to xcatd syslog(LOG_INFO, "Opening socket to xcatd..."); diff --git a/xCAT-UI/lib/srv_functions.php b/xCAT-UI/lib/srv_functions.php index 6dafe540e..161af8ecc 100644 --- a/xCAT-UI/lib/srv_functions.php +++ b/xCAT-UI/lib/srv_functions.php @@ -79,7 +79,7 @@ function submit_request($req, $skipVerify, $opts_array){ // Open syslog, include the process ID and also send // the log to standard error, and use a user defined // logging mechanism - openlog("xCAT-UI", LOG_PID | LOG_PERROR, LOG_LOCAL0); + openlog("xcat", LOG_PID | LOG_PERROR, LOG_LOCAL0); // Open a socket to xcatd syslog(LOG_INFO, "Opening socket to xcatd..."); diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm index 25d49504a..86f582b51 100644 --- a/xCAT-server/lib/xcat/plugins/nodediscover.pm +++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm @@ -137,7 +137,7 @@ sub process_request { my $doreq = shift; my $node = $request->{node}->[0]; my $clientip = $request->{'_xcat_clientip'}; - openlog("xCAT node discovery",'','local0'); + openlog("xcat",'','local0'); #First, fill in tables with data fields.. diff --git a/xCAT-server/sbin/proxydhcp-xcat b/xCAT-server/sbin/proxydhcp-xcat index e64331be4..91fae26fa 100755 --- a/xCAT-server/sbin/proxydhcp-xcat +++ b/xCAT-server/sbin/proxydhcp-xcat @@ -34,7 +34,7 @@ if ($tobedaemon) { } # open syslog -openlog("proxydhcp", "nofatal", "local4"); +openlog("xcat", "nofatal", "local4"); my $socket; my $retry = 5; diff --git a/xCAT-server/sbin/xcat_traphandler b/xCAT-server/sbin/xcat_traphandler index 49d281e19..c5c9a3350 100755 --- a/xCAT-server/sbin/xcat_traphandler +++ b/xCAT-server/sbin/xcat_traphandler @@ -306,7 +306,7 @@ if ($LOG || (keys(%hashL)==0)) { if ($briefmsg) { $body=$briefmsg;} else { $body=$message; } - openlog("xCATMon Event","","local4"); + openlog("xcat","","local4"); if ($severity_type eq "Informational") { syslog("local4|info", "$head\n$body\n"); } else { diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 0ea124fa1..9670055a7 100755 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -110,7 +110,7 @@ use xCAT::ExtTab; use Data::Dumper; use Getopt::Long; use Sys::Syslog qw(:DEFAULT setlogsock); -openlog("xcatd",,"local4"); +openlog("xcat",,"local4"); # turn off warnings for call to setlogsock. puts out warning message if # syslog tcp port not defined in /etc/services. this can safely be ignored. no warnings; @@ -671,7 +671,7 @@ sub do_udp_service { #This function opens up a UDP port sleep 0.05; } - openlog("xCAT UDP",'','local4'); + openlog("xcat",'','local4'); unless ($socket) { xCAT::MsgUtils->message("S","xCAT UDP service unable to open port $port: $!"); closelog(); @@ -1050,7 +1050,7 @@ $chrselect->add($chreadpipe); my $peername; my $ssltimeout; my $retry=1; -openlog("xCAT SSL","","local4"); +openlog("xcat","","local4"); my $listener; my $mainpidfile; $SIG{USR2} = sub { diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl index d98426425..cc60e745b 100755 --- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl +++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl @@ -124,7 +124,7 @@ sub logger { my $msg = shift; setlogsock('unix'); - openlog('autogpfsc','','local0'); + openlog('xcat','','local0'); syslog($type,$msg); closelog(); } diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl index bbee72f31..d0e9e93f9 100755 --- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl +++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd.pl @@ -369,7 +369,7 @@ sub logger { my $msg = shift; setlogsock('unix'); - openlog('autogpfsd','','local0'); + openlog('xcat','','local0'); syslog($type,$msg); closelog(); diff --git a/xCAT/postscripts/confGang b/xCAT/postscripts/confGang index 96814e8ab..bfa4a97d8 100755 --- a/xCAT/postscripts/confGang +++ b/xCAT/postscripts/confGang @@ -116,13 +116,11 @@ fi if [ ! -f $gmond_conf ]; then # echo "file not found" - logger -t gmonfail "gmond configuration file not found" logger -t xcat -p local4.warning "gmond configuration file not found" fi if [ ! -f $gmond_conf_old ]; then # echo "file not found" - logger -t gmonfail "gmond configuration file not found" logger -t xcat -p local4.warning "gmond configuration file not found" fi From 754b22c7106c593fcd49e2b61310927057e2a5af Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Thu, 2 Jul 2015 03:29:44 -0400 Subject: [PATCH 2/9] enhance mknb -c command --- xCAT-server/lib/xcat/plugins/mknb.pm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm index 400b5943d..8f2a9be2d 100644 --- a/xCAT-server/lib/xcat/plugins/mknb.pm +++ b/xCAT-server/lib/xcat/plugins/mknb.pm @@ -19,6 +19,7 @@ sub process_request { my $serialport; my $serialspeed; my $serialflow; + my $initrd_file = undef; my $xcatdport = 3001; #if ($sitetab) { #my $portent = $sitetab->getAttribs({key=>'defserialport'},'value'); @@ -130,7 +131,6 @@ sub process_request { system("ssh-keygen -t rsa -f $tempdir/etc/ssh_host_rsa_key -C '' -N ''"); system("ssh-keygen -t dsa -f $tempdir/etc/ssh_host_dsa_key -C '' -N ''"); } - my $initrd_file = undef; my $lzma_exit_value=1; if ($invisibletouch) { my $done=0; @@ -164,6 +164,22 @@ sub process_request { } CREAT_CONF_FILE: + if ($configfileonly) { + unless (-e "$tftpdir/xcat/genesis.kernel.$arch") { + $callback->({error=>["No kernel file found in $tftpdir/xcat, pls run \"mknb $arch\" instead."],errorcode=>[1]}); + return; + } + if (-e "$tftpdir/xcat/genesis.fs.$arch.lzma") { + $initrd_file = "$tftpdir/xcat/genesis.fs.$arch.lzma"; + } elsif (-e "$tftpdir/xcat/genesis.fs.$arch.gz") { + $initrd_file = "$tftpdir/xcat/genesis.fs.$arch.gz"; + } elsif (-e "$tftpdir/xcat/nbfs.$arch.gz") { + $initrd_file = "$tftpdir/xcat/nbfs.$arch.gz"; + } else { + $callback->({error=>["No filesystem file found in $tftpdir/xcat, pls run \"mknb $arch\" instead."],errorcode=>[1]}); + return; + } + } my $hexnets = xCAT::NetworkUtils->my_hexnets(); my $normnets = xCAT::NetworkUtils->my_nets(); my $consolecmdline; @@ -305,7 +321,6 @@ CREAT_CONF_FILE: close($cfgfile); } } - if ($configfileonly) { $callback->({data=>["Write netboot config file done"]}); } From b2d0ef4d87ddaa774f7703bf9a25aeb04768fb07 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Thu, 2 Jul 2015 04:01:56 -0400 Subject: [PATCH 3/9] provide mknb [-c] RESTAPI --- xCAT-server/xCAT-wsapi/xcatws.cgi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/xCAT-server/xCAT-wsapi/xcatws.cgi b/xCAT-server/xCAT-wsapi/xcatws.cgi index 51ac7c37b..b16bb42f0 100755 --- a/xCAT-server/xCAT-wsapi/xcatws.cgi +++ b/xCAT-server/xCAT-wsapi/xcatws.cgi @@ -757,6 +757,18 @@ my %URIdef = ( fhandler => \&common, }, }, + #### definition for mknb [-c] + nbimage => { + desc => "[URI:/nbimage] - Create netboot root image for specified arch.", + matcher => '^/services/nbimage/arch/[ppc64|x86_64]', + POST => { + desc => "creates a network boot root image", + usage => "|$usagemsg{objchparam} DataBody: {\"onlyconfigfile\":\"[true|yes|Y|1]|[false|no|N|0]\"}.|$usagemsg{non_getreturn}|", + example => "|Create a network boot root iamge for the specified arch|", + cmd => "mknb", + fhandler => \&actionhdl, + }, + }, }, #### definition for network resources @@ -2064,6 +2076,20 @@ sub actionhdl { push @args, ('-n', $paramhash->{'newNode'}); } } + } elsif ($params->{'resourcename'} eq "nbimage") { + delete $request->{noderange}; + push @args, $urilayers[3]; + if (isPost()) { + if (defined($paramhash->{'onlyconfigfile'})) { + my $tmp_value = $paramhash->{'onlyconfigfile'}; + if ($tmp_value =~ /true|yes|Y|1/i) { + push @args, "-c"; + } elsif ($tmp_value !~ /false|no|N|0/i) { + error ("Option value \"$tmp_value\" invalid.", $STATUS_BAD_REQUEST, 3); + } + } + } + } push @{$request->{arg}}, @args; From f8183abc50e86ab8d7e35ef63f27551c9f3acb74 Mon Sep 17 00:00:00 2001 From: amy0701 Date: Thu, 2 Jul 2015 04:50:03 -0400 Subject: [PATCH 4/9] fix defect 51557 buildkit cannot pickup latest deb package for pessl when creating complete kit --- xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm b/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm index 72e13c120..e8c849db8 100644 --- a/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm +++ b/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm @@ -420,8 +420,16 @@ sub testVersion_deb if ($::VERBOSE) { print "dpkg --compare-versions $version1 $operator $version2 \n"; } - my $result =`dpkg --compare-versions $version1 $operator $version2`; - + my $cmd ="dpkg --compare-versions $version1 $operator $version2"; + my $outref = []; + my $result = 0; + @$outref = `$cmd 2>&1`; + $result = $? ; + if ($result) + { + $result = $result >> 8; + } + return $result; } From d4e1383e68263b303a8eab2b741929b4900cc7d6 Mon Sep 17 00:00:00 2001 From: immarvin Date: Thu, 2 Jul 2015 09:01:10 -0400 Subject: [PATCH 5/9] overwritten the SvrUtils.pm by mistake, recover it --- xCAT-server/lib/perl/xCAT/SvrUtils.pm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm index 77ac57c72..535afed84 100755 --- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm +++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm @@ -14,7 +14,6 @@ require xCAT::TableUtils; require xCAT::NetworkUtils; use File::Basename; use File::Path; - use strict; use Exporter; our @ISA = qw/Exporter/; @@ -640,7 +639,7 @@ sub update_tables_with_templates #now get all the profile names for full installation my %profiles=(); - my @tmplfiles=glob($cuspath."/*.tmpl"); + my @tmplfiles=glob($cuspath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -654,7 +653,7 @@ sub update_tables_with_templates #print "$tmpf\n"; $profiles{$tmpf}=1; } - @tmplfiles=glob($defpath."/*.tmpl"); + @tmplfiles=glob($defpath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -845,7 +844,7 @@ sub update_tables_with_mgt_image #now get all the profile names for full installation my %profiles=(); - my @tmplfiles=glob($cuspath."/*.tmpl"); + my @tmplfiles=glob($cuspath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -854,7 +853,7 @@ sub update_tables_with_mgt_image #print "$tmpf\n"; $profiles{$tmpf}=1; } - @tmplfiles=glob($defpath."/*.tmpl"); + @tmplfiles=glob($defpath."/{compute,service}.*tmpl"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -1049,7 +1048,7 @@ sub update_tables_with_diskless_image if ($profile) { $profiles{$profile} = 1; } else { - my @tmplfiles=glob($cuspath."/*.pkglist"); + my @tmplfiles=glob($cuspath."/compute.*pkglist"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' @@ -1057,7 +1056,7 @@ sub update_tables_with_diskless_image $tmpf = $1; $profiles{$tmpf}=1; } - @tmplfiles=glob($defpath."/*.pkglist"); + @tmplfiles=glob($defpath."/compute.*pkglist"); foreach (@tmplfiles) { my $tmpf=basename($_); #get the profile name out of the file, TODO: this does not work if the profile name contains the '.' From 60bcc9e8840dd197c194ba439e34a170068fdd2f Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 2 Jul 2015 14:18:36 -0400 Subject: [PATCH 6/9] export XCATSSLVER=TLSv1 in xcathmc when on the sles11 platform. change rcons so that if nodehm.conserver is set, the server is the SAME node, don't pass the -s option to confetty for now. --- xCAT-client/bin/rcons | 9 ++++++++- .../lib/python/confluent/plugins/console/xcathmc.sh | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons index 50dad3b9d..21f204e58 100755 --- a/xCAT-client/bin/rcons +++ b/xCAT-client/bin/rcons @@ -75,8 +75,15 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/ fi if [ -z "$CONSERVER" ]; then CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '` + declare -a ipaddrs=`ip addr | grep 'inet' | awk {'print $2'} | cut -d/ -f1 | grep -v : | tr '\n' ' '` + for IP in ${ipaddrs[*]}; do + if [[ "${CONSERVER}" == "${IP}" ]]; then + # conserver is the same node, do not connect using -s + CONSERVER="" + break + fi + done fi - if [ -z "$CONSERVER" ]; then CONSERVER=$XCATHOST fi diff --git a/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh b/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh index 5b3a3cc65..90f6efac6 100755 --- a/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh +++ b/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh @@ -1,2 +1,9 @@ #!/bin/bash +# export XCATSSLVER for SLES 11. Other OS can work without this setting. +if [ -r /etc/SuSE-release ]; then + ver=`grep 'VERSION' /etc/SuSE-release | awk -F= '{print $2}' | sed 's/ //g'` + if [ "$ver" = "11" ]; then + export XCATSSLVER=TLSv1 + fi +fi exec /opt/xcat/share/xcat/cons/hmc $CONFLUENT_NODE From f0b3125e0bf15d440a0676e8b816f5862812aa00 Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Thu, 2 Jul 2015 14:28:19 -0400 Subject: [PATCH 7/9] Bug #4721 makentp -a didn't work on sles11.3 --- xCAT-server/lib/xcat/plugins/makentp.pm | 4 ++-- xCAT/postscripts/setupntp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/makentp.pm b/xCAT-server/lib/xcat/plugins/makentp.pm index ff083d2d4..c32ac744f 100755 --- a/xCAT-server/lib/xcat/plugins/makentp.pm +++ b/xCAT-server/lib/xcat/plugins/makentp.pm @@ -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"; } diff --git a/xCAT/postscripts/setupntp b/xCAT/postscripts/setupntp index a3d07d8cf..6b74fd656 100755 --- a/xCAT/postscripts/setupntp +++ b/xCAT/postscripts/setupntp @@ -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 From bfd69e98242ca9b39ac78678e4fc4abd0b9c4194 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 2 Jul 2015 14:41:43 -0400 Subject: [PATCH 8/9] If conserver and confluent are running at the same time, rcons will say "Connection closed." Add a check in the rcons code to make sure that if confluent is configured to be used, conserver is not running and vice versa. --- xCAT-client/bin/rcons | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons index 21f204e58..40f919578 100755 --- a/xCAT-client/bin/rcons +++ b/xCAT-client/bin/rcons @@ -65,7 +65,12 @@ if [ "$CONSOLE_SERVICE_KEYWORD" == "consoleservice" ]; then fi if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/usr/bin/confetty" ] || [ -x "/usr/local/bin/confetty" ]); then - #use confluent + # use confluent, make sure conserver is not also running + CONSERVER_RC=`service conserver status >> /dev/null; echo $?` + if [[ ${CONSERVER_RC} == 0 ]]; then + echo "Error: consoleservice is set to 'confluent' but conserver is running. Stop conserver, run makeconfluentcfg, and retry..." + exit 1 + fi CONFETTY="confetty" if [ -x "/opt/confluent/bin/confetty" ]; then CONFETTY="/opt/confluent/bin/confetty" @@ -92,7 +97,13 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/ fi $CONFETTY $CONSCONTROLPATH $CONSERVER $1 elif [ -f "/usr/bin/console" ] || [ -f "/bin/console" ]; then - #use conserver + # use conserver, make sure confluent is not also running + CONFLUENT_RC=`service confluent status >> /dev/null; echo $?` + if [[ ${CONFLUENT_RC} == 0 ]]; then + echo "Error: consoleservice is set to 'conserver' but confluent is running. Stop confluent, run makeconservercf, and retry..." + exit 1 + fi + if [ -z "$CONSERVER" ]; then CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '` fi From 7c70f2c3d1905fd75f8fed410915e0c02628aafb Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Thu, 2 Jul 2015 14:42:50 -0400 Subject: [PATCH 9/9] Bug#4719 makentp man page need modified --- xCAT-client/pods/man1/makentp.1.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-client/pods/man1/makentp.1.pod b/xCAT-client/pods/man1/makentp.1.pod index 50afef392..aa8038c11 100755 --- a/xCAT-client/pods/man1/makentp.1.pod +++ b/xCAT-client/pods/man1/makentp.1.pod @@ -6,12 +6,12 @@ B - Setup NTP server on the management node and the service node. =head1 SYNOPSIS -I +I -I +I -I +I