defect 2847600. Remove some useless messages from the standand output for updatenode
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4077 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
d1a823cab8
commit
830f4ce4bc
@ -38,7 +38,7 @@ config_Rsyslog_C3()
|
||||
cp -f $2 $2.XCATORIG
|
||||
fi
|
||||
|
||||
grep "xCAT settings" $conf_file
|
||||
grep "xCAT settings" $conf_file 2>&1 1> /dev/null
|
||||
if [ $? -gt 0 ]; then
|
||||
echo "# xCAT settings" >> $2
|
||||
#enable to receive remote logging
|
||||
@ -100,7 +100,7 @@ if [ $isLinux -eq 1 ] && [ -a $sysconfig ]; then
|
||||
|
||||
#check if it is ryslog version 3, it has totally different settings in /etc/syslog.cong
|
||||
if [ $isRsyslog -eq 1 ]; then
|
||||
grep "SYSLOGD_OPTIONS" $sysconfig | grep -e "[\-c 3|\-c3]"
|
||||
grep "SYSLOGD_OPTIONS" $sysconfig | grep -e "[\-c 3|\-c3]" 2>&1 1> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
isC3=1
|
||||
fi
|
||||
@ -172,7 +172,7 @@ else
|
||||
cp -f $conf_file $conf_file.XCATORIG
|
||||
fi
|
||||
|
||||
grep "xCAT settings" $conf_file
|
||||
grep "xCAT settings" $conf_file 2>&1 1> /dev/null
|
||||
if [ $? -gt 0 ]; then
|
||||
if [ $isLinux -eq 0 ]; then # aix
|
||||
echo "# xCAT settings" >> $conf_file
|
||||
@ -186,7 +186,7 @@ else
|
||||
if [ ! -f $conf_file.XCATORIG ]; then
|
||||
cp -f $conf_file $conf_file.XCATORIG
|
||||
fi
|
||||
grep "xCAT settings" $conf_file
|
||||
grep "xCAT settings" $conf_file 2>&1 1> /dev/null
|
||||
if [ $? -gt 0 ]; then
|
||||
echo "# xCAT settings" >> $conf_file
|
||||
echo "destination loghost { udp(\"$master\"); };" >> $conf_file
|
||||
|
@ -23,9 +23,9 @@ if [ -e '/etc/SuSE-release' ]; then
|
||||
OSVER=`grep -h VERSION /etc/SuSE-release |awk '{print $3}'`
|
||||
fi
|
||||
|
||||
SIP=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*.leases|tail -n 1|awk '{print $3}'|sed -e 's/;//'`
|
||||
SIP=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*.leases 2> /dev/null|tail -n 1|awk '{print $3}'|sed -e 's/;//'`
|
||||
if [ -z "$SIP" ]; then
|
||||
SIP=`grep -h DHCPSID /var/lib/dhcpcd/*.info|awk -F= '{print $2}'|tail -n 1`
|
||||
SIP=`grep -h DHCPSID /var/lib/dhcpcd/*.info 2> /dev/null|awk -F= '{print $2}'|tail -n 1`
|
||||
fi
|
||||
|
||||
#echo "SIP=$SIP"
|
||||
|
Loading…
Reference in New Issue
Block a user