diff --git a/xCAT-client-2.0/xCAT-client.spec b/xCAT-client-2.0/xCAT-client.spec index ee09bdc4d..11f22f8a8 100644 --- a/xCAT-client-2.0/xCAT-client.spec +++ b/xCAT-client-2.0/xCAT-client.spec @@ -107,12 +107,12 @@ rm -rf $RPM_BUILD_ROOT %post %ifos linux -echo "XCATROOT=$XCATROOT +echo "XCATROOT=$RPM_INSTALL_PREFIX0 PATH=\$PATH:\$XCATROOT/bin:\$XCATROOT/sbin MANPATH=\$MANPATH:\$XCATROOT/share/man export XCATROOT PATH MANPATH" >/etc/profile.d/xcat.sh -echo "setenv XCATROOT \"$XCATROOT\" +echo "setenv XCATROOT \"$RPM_INSTALL_PREFIX0\" setenv PATH \${PATH}:\${XCATROOT}/bin:\${XCATROOT}/sbin setenv MANPATH \${MANPATH}:\${XCATROOT}/share/man" >/etc/profile.d/xcat.csh chmod 755 /etc/profile.d/xcat.* diff --git a/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm b/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm index 56b7900c2..69cb2fe72 100644 --- a/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm +++ b/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm @@ -97,7 +97,7 @@ sub supportNodeStatusMon { #-------------------------------------------------------------------------------- sub startNodeStatusMon { #print "xcatmon.startNodeStatusMon\n"; - my $newentry="*/3 * * * * $::XCATROOT/sbin/xcatnodemon >> /var/log/xcatmon.log"; + my $newentry="*/3 * * * * $::XCATROOT/sbin/xcatnodemon"; my ($code, $msg)=xCAT::Utils::add_cron_job($newentry); if ($code==0) { return (0, "started"); } else { return ($code, $msg); } diff --git a/xCAT-server-2.0/sbin/xcatnodemon b/xCAT-server-2.0/sbin/xcatnodemon index 5499bfefb..256a5b3b9 100755 --- a/xCAT-server-2.0/sbin/xcatnodemon +++ b/xCAT-server-2.0/sbin/xcatnodemon @@ -24,9 +24,9 @@ my %nodes_status_old=xCAT_monitoring::monitorctrl::getNodeStatus(); my $tmp_node_active=$nodes_status_old{$::STATUS_ACTIVE}; my $tmp_node_inactive=$nodes_status_old{$::STATUS_INACTIVE}; my $tmp_node_unknown=$nodes_status_old{unknown}; -print "active nodes: @$tmp_node_active\n"; -print "inactive nodes: @$tmp_node_inactive\n"; -print "unknown nodes: @$tmp_node_unknown\n"; +#print "active nodes: @$tmp_node_active\n"; +#print "inactive nodes: @$tmp_node_inactive\n"; +#print "unknown nodes: @$tmp_node_unknown\n"; #get current node status my %nodes_status_new1=();