Home / Browse / xCAT / Mail / Archive

xCAT

Email Archive: xcat-commit (read-only)

[Xcat-commit] SF.net SVN: xcat:[2993] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2009-03-25 20:26

Revision: 2993
          http://xcat.svn.sourceforge.net/xcat/?rev=2993&view=rev
Author:   linggao
Date:     2009-03-25 20:26:16 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
fix syslog postscript to work on SLES 10.2

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2009-03-25 19:19:52 UTC (rev 2992)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2009-03-25 20:26:16 UTC (rev 2993)
@@ -77,7 +77,7 @@
       #find out which syslog is used for SLES, syslog or syslog-ng
       result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
       if [[ $result = *syslog-ng* ]]; then
-        conf_file="/etc/syslog-ng/syslog-ng.conf.in"
+        conf_file="/etc/syslog-ng/syslog-ng.conf"
         ng=1
       fi
     fi
@@ -110,7 +110,7 @@
   if [ $isC3 -eq 0 ]; then 
     if [ -f /etc/xCATMN ]; then
       #on MN: make the syslogd be able to receive remote logs 
-      awk  '{if($0 ~ /^SYSLOGD_OPTIONS=/) {
+      awk  '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
             if ($0 !~ /-r/) {sub(/\"$/, " -r\"", $0)}
             if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
             print $0}
@@ -118,7 +118,7 @@
     else
       if [ $isSN -eq 1 ]; then
         #on SN: make the syslog be able to receive and forward remote logs
-        awk '{if($0 ~ /^SYSLOGD_OPTIONS=/) {
+        awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
               if ($0 !~ /-r/) {sub(/\"$/, " -r\"", $0)}
               if ($0 !~ /-h/) {sub(/\"$/, " -h\"", $0)}
               if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
@@ -126,7 +126,7 @@
             else { print $0}}'  $sysconfig > $sysconfig.tmp 
       else
         ##turn off the time marker on all 
-        awk '{if($0 ~ /^SYSLOGD_OPTIONS=/) {
+        awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
               if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
               print $0}
             else {print $0}}' $sysconfig > $sysconfig.tmp 
@@ -138,11 +138,13 @@
 
 
 #syslog-ng has different way of enabling log forwarding
-if [ $ng -eq 1 -a $isSN -eq 1 ]; then
-  if [ ! -f $conf_file.XCATORIG ];  then
-    cp -f $conf_file $conf_file.XCATORIG
+if [ $ng -eq 1 ]; then
+  if [ $isSN -eq 1 -o -f /etc/xCATMN ]; then
+    if [ ! -f $conf_file.XCATORIG ];  then
+       cp -f $conf_file $conf_file.XCATORIG
+    fi
+    sed -i 's/#udp(ip("0.0.0.0/udp(ip("0.0.0.0/' $conf_file
   fi
-  sed -i 's/#udp(ip("0.0.0.0/udp(ip("0.0.0.0/' $conf_file
 fi
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Xcat-commit] SF.net SVN: xcat:[2000] xcat-core/trunk/xCAT/postscripts/syslog	<linggao@us...>

[Xcat-commit] SF.net SVN: xcat:[2002] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2008-08-08 20:58

Revision: 2002
          http://xcat.svn.sourceforge.net/xcat/?rev=2002&view=rev
Author:   linggao
Date:     2008-08-08 20:58:28 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
minor fix in syslog

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2008-08-08 20:57:46 UTC (rev 2001)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2008-08-08 20:58:28 UTC (rev 2002)
@@ -28,7 +28,6 @@
 {
   isReceiving=0
   isLocal=$1
-  echo "isLocal=$isLocal 2=$2"
 
   if [ -f /etc/xCATMN ] || [ -f /etc/xCATSN ]
   then 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[2305] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2008-10-08 15:24

Revision: 2305
          http://xcat.svn.sourceforge.net/xcat/?rev=2305&view=rev
Author:   linggao
Date:     2008-10-08 15:24:04 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
syslog fix for AIX

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2008-10-08 15:16:49 UTC (rev 2304)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2008-10-08 15:24:04 UTC (rev 2305)
@@ -208,7 +208,12 @@
 
 #restart the syslog daemon to take the new conf file settings
 if [ $isLinux -eq 0 ]; then
-  refresh -s syslogd
+  PARSE_SRC_STATE="-e1d;s/.* \([a-zA-Z0-9]*\)$/\1/"
+  state=$(LC_ALL=C lssrc -s syslogd | LC_ALL=C sed "$PARSE_SRC_STATE")
+  if [[ -n "$state" && "$state" = "active" ]];then
+     stopsrc -s syslogd
+  fi
+  startsrc -s syslogd
 else 
   $init restart
 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[2530] xcat-core/trunk/xCAT/postscripts/syslog

From: <andywray@us...> - 2008-12-03 19:01

Revision: 2530
          http://xcat.svn.sourceforge.net/xcat/?rev=2530&view=rev
Author:   andywray
Date:     2008-12-03 19:01:26 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
Fix syslog-ng handling in SLES 10.

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2008-12-02 18:36:32 UTC (rev 2529)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2008-12-03 19:01:26 UTC (rev 2530)
@@ -77,7 +77,7 @@
       #find out which syslog is used for SLES, syslog or syslog-ng
       result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
       if [[ $result = *syslog-ng* ]]; then
-        conf_file="/etc/syslog-ng/syslog-ng.conf"
+        conf_file="/etc/syslog-ng/syslog-ng.conf.in"
         ng=1
       fi
     fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[2953] xcat-core/trunk/xCAT/postscripts/syslog

From: <datajerk@us...> - 2009-03-21 01:09

Revision: 2953
          http://xcat.svn.sourceforge.net/xcat/?rev=2953&view=rev
Author:   datajerk
Date:     2009-03-21 01:09:10 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
Added RH5 rsyslog support.

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2009-03-20 21:36:49 UTC (rev 2952)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2009-03-21 01:09:10 UTC (rev 2953)
@@ -65,7 +65,7 @@
 fi
 
 if [[ $OSTYPE = linux* ]]; then
-  if [[ $OSVER = fedora* ]] || [[ -f /etc/fedora-release ]]; then
+  if [[ $OSVER = fedora* ]] || [[ $OSVER = rhels5* ]] || [[ -f /etc/fedora-release ]]; then
     if [ -e /etc/rsyslog.conf ]; then
       conf_file="/etc/rsyslog.conf"
       sysconfig="/etc/sysconfig/rsyslog"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[2993] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2009-03-25 20:26

Revision: 2993
          http://xcat.svn.sourceforge.net/xcat/?rev=2993&view=rev
Author:   linggao
Date:     2009-03-25 20:26:16 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
fix syslog postscript to work on SLES 10.2

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2009-03-25 19:19:52 UTC (rev 2992)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2009-03-25 20:26:16 UTC (rev 2993)
@@ -77,7 +77,7 @@
       #find out which syslog is used for SLES, syslog or syslog-ng
       result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
       if [[ $result = *syslog-ng* ]]; then
-        conf_file="/etc/syslog-ng/syslog-ng.conf.in"
+        conf_file="/etc/syslog-ng/syslog-ng.conf"
         ng=1
       fi
     fi
@@ -110,7 +110,7 @@
   if [ $isC3 -eq 0 ]; then 
     if [ -f /etc/xCATMN ]; then
       #on MN: make the syslogd be able to receive remote logs 
-      awk  '{if($0 ~ /^SYSLOGD_OPTIONS=/) {
+      awk  '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
             if ($0 !~ /-r/) {sub(/\"$/, " -r\"", $0)}
             if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
             print $0}
@@ -118,7 +118,7 @@
     else
       if [ $isSN -eq 1 ]; then
         #on SN: make the syslog be able to receive and forward remote logs
-        awk '{if($0 ~ /^SYSLOGD_OPTIONS=/) {
+        awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
               if ($0 !~ /-r/) {sub(/\"$/, " -r\"", $0)}
               if ($0 !~ /-h/) {sub(/\"$/, " -h\"", $0)}
               if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
@@ -126,7 +126,7 @@
             else { print $0}}'  $sysconfig > $sysconfig.tmp 
       else
         ##turn off the time marker on all 
-        awk '{if($0 ~ /^SYSLOGD_OPTIONS=/) {
+        awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
               if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
               print $0}
             else {print $0}}' $sysconfig > $sysconfig.tmp 
@@ -138,11 +138,13 @@
 
 
 #syslog-ng has different way of enabling log forwarding
-if [ $ng -eq 1 -a $isSN -eq 1 ]; then
-  if [ ! -f $conf_file.XCATORIG ];  then
-    cp -f $conf_file $conf_file.XCATORIG
+if [ $ng -eq 1 ]; then
+  if [ $isSN -eq 1 -o -f /etc/xCATMN ]; then
+    if [ ! -f $conf_file.XCATORIG ];  then
+       cp -f $conf_file $conf_file.XCATORIG
+    fi
+    sed -i 's/#udp(ip("0.0.0.0/udp(ip("0.0.0.0/' $conf_file
   fi
-  sed -i 's/#udp(ip("0.0.0.0/udp(ip("0.0.0.0/' $conf_file
 fi
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[5332] xcat-core/trunk/xCAT/postscripts/syslog

From: <lissav@us...> - 2010-03-02 13:31

Revision: 5332
          http://xcat.svn.sourceforge.net/xcat/?rev=5332&view=rev
Author:   lissav
Date:     2010-03-02 13:31:04 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
fix for defect 2957917

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2010-03-02 11:36:06 UTC (rev 5331)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2010-03-02 13:31:04 UTC (rev 5332)
@@ -111,23 +111,23 @@
     if [ -f /etc/xCATMN ]; then
       #on MN: make the syslogd be able to receive remote logs 
       awk  '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
-            if ($0 !~ /-r/) {sub(/\"$/, " -r\"", $0)}
-            if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
+            if ($0 !~ /-r/) {sub(/-/, "-r -", $0)}
+            if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/-/, "-m 0 -", $0)}
             print $0}
           else { print $0}}'  $sysconfig > $sysconfig.tmp 
     else
       if [ $isSN -eq 1 ]; then
         #on SN: make the syslog be able to receive and forward remote logs
         awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
-              if ($0 !~ /-r/) {sub(/\"$/, " -r\"", $0)}
-              if ($0 !~ /-h/) {sub(/\"$/, " -h\"", $0)}
-              if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
+              if ($0 !~ /-r/) {sub(/-/, "-r -", $0)}
+              if ($0 !~ /-h/) {sub(/-/, "-h -", $0)}
+              if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/-/, "-m 0 -", $0)}
               print $0}
             else { print $0}}'  $sysconfig > $sysconfig.tmp 
       else
         ##turn off the time marker on all 
         awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
-              if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/\"$/, " -m 0\"", $0)}
+              if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/-/, "-m 0 -", $0)}
               print $0}
             else {print $0}}' $sysconfig > $sysconfig.tmp 
       fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[6627] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2010-06-30 19:20

Revision: 6627
          http://xcat.svn.sourceforge.net/xcat/?rev=6627&view=rev
Author:   linggao
Date:     2010-06-30 19:20:15 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
fix syslog so it works for snmove

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2010-06-30 18:25:59 UTC (rev 6626)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2010-06-30 19:20:15 UTC (rev 6627)
@@ -39,23 +39,25 @@
   fi
 
   grep "xCAT settings" $conf_file 2>&1 1> /dev/null
-  if [ $? -gt 0 ]; then
+  if [ $? -eq 0 ]; then
+       sed -i "/# xCAT settings/,$ d" $2
+  fi
+
   echo "# xCAT settings" >> $2
-    #enable to receive remote logging
-    if [ $isReceiving -eq 1 ]; then
+  #enable to receive remote logging
+  if [ $isReceiving -eq 1 ]; then
       sed -i 's/^\#\(\s\)*\$ModLoad\(\s\)*imudp.so/\$ModLoad imudp.so/' $2
       sed -i 's/^\#\(\s\)*\$UDPServerRun/\$UDPServerRun/' $2
-    fi
+  fi
 
-    #enable to send the logging to master
-    if [ $isLocal -eq 1 ]; then
+  #enable to send the logging to master
+  if [ $isLocal -eq 1 ]; then
        touch  /var/log/messages  
-    else
+  else
       sed -i 's/^\(\*\..*\)/\#\1/' $2  
       sed -i 's/^\(news\|local7\|mail\|authpriv\|cron\|kern\)\./\#\1\./' $2  
       echo "*.* @$master" >> $2
-    fi 
-  fi
+  fi 
 }
 
 #echo "NTYPE=$NTYPE,OSVER=$OSVER,OSTYPE=$OSTYPE"
@@ -173,11 +175,13 @@
       fi
 
       grep "xCAT settings" $conf_file 2>&1 1> /dev/null
-      if [ $? -gt 0 ]; then
-        if [ $isLinux -eq 0 ]; then # aix
+      if [ $? -eq 0 ]; then
+	  sed -i "/# xCAT settings/,$ d" $conf_file
+      fi
+
+      if [ $isLinux -eq 0 ]; then # aix
           echo "# xCAT settings" >> $conf_file
           echo "*.debug   /var/log/messages  rotate 1024K files 5" >> $conf_file
-        fi
       fi
     fi
   else 
@@ -187,11 +191,12 @@
         cp -f $conf_file $conf_file.XCATORIG
       fi
       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
-        echo 'log { source(src); destination(loghost); };' >> $conf_file
+      if [ $? -eq 0 ]; then
+	  sed -i "/# xCAT settings/,$ d" $conf_file
       fi
+      echo "# xCAT settings" >> $conf_file
+      echo "destination loghost { udp(\"$master\"); };" >> $conf_file
+      echo 'log { source(src); destination(loghost); };' >> $conf_file
     else 
       if [ -f $conf_file.XCATORIG ]; then 
         rm -f $conf_file 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[6659] xcat-core/trunk/xCAT/postscripts/syslog

From: <mxi1@us...> - 2010-07-07 08:35

Revision: 6659
          http://xcat.svn.sourceforge.net/xcat/?rev=6659&view=rev
Author:   mxi1
Date:     2010-07-07 08:34:54 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
remove the "-i" option from the "sed" command, which will fail in statelite environment

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2010-07-07 08:27:42 UTC (rev 6658)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2010-07-07 08:34:54 UTC (rev 6659)
@@ -36,26 +36,33 @@
 
   if [ ! -f $2.XCATORIG ]; then
     cp -f $2 $2.XCATORIG
+  else
+    cat $2 > $2.XCATORIG
   fi
 
   grep "xCAT settings" $conf_file 2>&1 1> /dev/null
   if [ $? -eq 0 ]; then
-       sed -i "/# xCAT settings/,$ d" $2
+       sed "/# xCAT settings/,$ d" $2 >/tmp/sed.tmp
+       cat /tmp/sed.tmp >$2
   fi
 
   echo "# xCAT settings" >> $2
   #enable to receive remote logging
   if [ $isReceiving -eq 1 ]; then
-      sed -i 's/^\#\(\s\)*\$ModLoad\(\s\)*imudp.so/\$ModLoad imudp.so/' $2
-      sed -i 's/^\#\(\s\)*\$UDPServerRun/\$UDPServerRun/' $2
+      sed 's/^\#\(\s\)*\$ModLoad\(\s\)*imudp.so/\$ModLoad imudp.so/' $2 >/tmp/sed.tmp
+      cat /tmp/sed.tmp >$2
+      sed 's/^\#\(\s\)*\$UDPServerRun/\$UDPServerRun/' $2 >/tmp/sed.tmp
+      cat /tmp/sed.tmp >$2
   fi
 
   #enable to send the logging to master
   if [ $isLocal -eq 1 ]; then
        touch  /var/log/messages  
   else
-      sed -i 's/^\(\*\..*\)/\#\1/' $2  
-      sed -i 's/^\(news\|local7\|mail\|authpriv\|cron\|kern\)\./\#\1\./' $2  
+      sed 's/^\(\*\..*\)/\#\1/' $2 >/tmp/sed.tmp
+      cat /tmp/sed.tmp >$2
+      sed 's/^\(news\|local7\|mail\|authpriv\|cron\|kern\)\./\#\1\./' $2 >/tmp/sed.tmp 
+      cat /tmp/sed.tmp >$2
       echo "*.* @$master" >> $2
   fi 
 }
@@ -67,7 +74,7 @@
 fi
 
 if [[ $OSTYPE = linux* ]]; then
-  if [[ $OSVER = fedora* ]] || [[ $OSVER = rhels5* ]] || [[ -f /etc/fedora-release ]]; then
+  if [[ $OSVER = fedora* ]] || [[ $OSVER = rhels5* ]] || [[ $OSVER = rhel6* ]] || [[ $OSVER = rhels6* ]] || [[ -f /etc/fedora-release ]]; then
     if [ -e /etc/rsyslog.conf ]; then
       conf_file="/etc/rsyslog.conf"
       sysconfig="/etc/sysconfig/rsyslog"
@@ -145,7 +152,8 @@
     if [ ! -f $conf_file.XCATORIG ];  then
        cp -f $conf_file $conf_file.XCATORIG
     fi
-    sed -i 's/#udp(ip("0.0.0.0/udp(ip("0.0.0.0/' $conf_file
+    sed 's/#udp(ip("0.0.0.0/udp(ip("0.0.0.0/' $conf_file >/tmp/sed.tmp
+    cat /tmp/sed.tmp >$conf_file
   fi
 fi
 
@@ -176,7 +184,8 @@
 
       grep "xCAT settings" $conf_file 2>&1 1> /dev/null
       if [ $? -eq 0 ]; then
-	  sed -i "/# xCAT settings/,$ d" $conf_file
+	  sed "/# xCAT settings/,$ d" $conf_file >/tmp/sed.tmp
+      cat /tmp/sed.tmp >$conf_file
       fi
 
       if [ $isLinux -eq 0 ]; then # aix
@@ -192,7 +201,8 @@
       fi
       grep "xCAT settings" $conf_file 2>&1 1> /dev/null
       if [ $? -eq 0 ]; then
-	  sed -i "/# xCAT settings/,$ d" $conf_file
+	  sed "/# xCAT settings/,$ d" $conf_file >/tmp/sed.tmp
+      cat /tmp/sed.tmp >$conf_file
       fi
       echo "# xCAT settings" >> $conf_file
       echo "destination loghost { udp(\"$master\"); };" >> $conf_file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[7756] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2010-10-05 18:13

Revision: 7756
          http://xcat.svn.sourceforge.net/xcat/?rev=7756&view=rev
Author:   linggao
Date:     2010-10-05 18:13:18 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
handle rsyslog c4 for rh6

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2010-10-05 14:56:31 UTC (rev 7755)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2010-10-05 18:13:18 UTC (rev 7756)
@@ -109,7 +109,7 @@
 
   #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]" 2>&1 1> /dev/null
+    grep "SYSLOGD_OPTIONS" $sysconfig | grep -e "[\-c 3|\-c3|\-c4|\-c 4]" 2>&1 1> /dev/null
     if [ $? -eq 0 ]; then
       isC3=1
     fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[7757] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2010-10-05 18:23

Revision: 7757
          http://xcat.svn.sourceforge.net/xcat/?rev=7757&view=rev
Author:   linggao
Date:     2010-10-05 18:22:56 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
fix in syslog script for rh

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2010-10-05 18:13:18 UTC (rev 7756)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2010-10-05 18:22:56 UTC (rev 7757)
@@ -74,7 +74,7 @@
 fi
 
 if [[ $OSTYPE = linux* ]]; then
-  if [[ $OSVER = fedora* ]] || [[ $OSVER = rhels5* ]] || [[ $OSVER = rhel6* ]] || [[ $OSVER = rhels6* ]] || [[ -f /etc/fedora-release ]]; then
+  if [[ $OSVER = fedora* ]] || [[ $OSVER = rhels5* ]] || [[ $OSVER = rhel6* ]] || [[ $OSVER = rhels6* ]] || [[ -f /etc/fedora-release ]] || [[ -f /etc/redhat-release ]]; then
     if [ -e /etc/rsyslog.conf ]; then
       conf_file="/etc/rsyslog.conf"
       sysconfig="/etc/sysconfig/rsyslog"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[10444] xcat-core/trunk/xCAT/postscripts/syslog

From: <ericagar@us...> - 2011-09-06 02:43

Revision: 10444
          http://xcat.svn.sourceforge.net/xcat/?rev=10444&view=rev
Author:   ericagar
Date:     2011-09-06 02:43:12 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Fix for defect 3404571: Fix bashisms in syslog

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2011-09-05 09:43:28 UTC (rev 10443)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2011-09-06 02:43:12 UTC (rev 10444)
@@ -24,6 +24,17 @@
 isRsyslog=0
 isC3=0
 
+# pmatch determines if 1st argument string is matched by 2nd argument pattern
+
+pmatch ()
+{
+  case $1 in
+    $2) return 0;;  # zero return code means string matched by pattern
+  esac
+
+  return 1          # non-zero return code means string not matched by pattern
+}
+
 config_Rsyslog_C3()
 {
   isReceiving=0
@@ -69,12 +80,12 @@
 
 #echo "NTYPE=$NTYPE,OSVER=$OSVER,OSTYPE=$OSTYPE"
 
-if [[ $NTYPE = service ]]; then 
+if [ $NTYPE = service ]; then 
   isSN=1
 fi
 
-if [[ $OSTYPE = linux* ]]; then
-  if [[ $OSVER = fedora* ]] || [[ $OSVER = rhels5* ]] || [[ $OSVER = rhel6* ]] || [[ $OSVER = rhels6* ]] || [[ -f /etc/fedora-release ]] || [[ -f /etc/redhat-release ]] || [[ $OSVER = ubuntu* ]]; then
+if [ "$(uname -s)" = "Linux" ]; then
+  if ( pmatch $OSVER "fedora*" ) || ( pmatch $OSVER "rhels5*" ) || ( pmatch $OSVER "rhel6*" ) || ( pmatch $OSVER "rhels6*" ) || [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ] || ( pmatch $OSVER "ubuntu*" ); then
     if [ -e /etc/rsyslog.conf ]; then
       conf_file="/etc/rsyslog.conf"
       sysconfig="/etc/sysconfig/rsyslog"
@@ -82,10 +93,10 @@
       isRsyslog=1
     fi
   else 
-    if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
+    if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
       #find out which syslog is used for SLES, syslog or syslog-ng
       result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
-      if [[ $result = *syslog-ng* ]]; then
+      if ( pmatch $result "*syslog-ng*" ); then
         conf_file="/etc/syslog-ng/syslog-ng.conf"
         ng=1
       fi
@@ -102,8 +113,8 @@
 
 
 #handle sysconfig file to make remote loggling possible 
-if [ $isLinux -eq 1 ] && [ -a $sysconfig ]; then 
-  if [[ ! -f "$sysconfig.XCATORIG" ]]; then
+if [ $isLinux -eq 1 ] && [ -e $sysconfig ]; then 
+  if [ ! -f "$sysconfig.XCATORIG" ]; then
     cp -f $sysconfig $sysconfig.XCATORIG
   fi
 
@@ -165,7 +176,7 @@
   goLocal=1
 else 
   if [ $isSN -eq 1 ]; then
-     if [[ $SVLOGLOCAL -eq 1 ]]; then
+     if [ $SVLOGLOCAL -eq 1 ]; then
        goLocal=1  
      fi
   fi
@@ -227,22 +238,22 @@
 if [ $isLinux -eq 0 ]; then
   PARSE_SRC_STATE="-e1d;s/.* \([a-zA-Z0-9]*\)$/\1/"
   state=$(LC_ALL=C lssrc -s syslogd | LC_ALL=C sed "$PARSE_SRC_STATE")
-  if [[ -n "$state" && "$state" = "active" ]];then
+  if [ -n "$state" ] && [ "$state" = "active" ]; then
      stopsrc -s syslogd
   fi
      
   #wait for syslogd to fully started
   RETRY_LIMIT=30          # number of 2 second retry intervals (60 second total)
-  let i=$RETRY_LIMIT
+  i=$RETRY_LIMIT
   while :
   do
       ret=`LC_ALL=C startsrc -s syslogd 2>&1`
-      if [[ $ret == *PID* ]];then
+      if ( pmatch $ret "*PID*" ); then
         break
       fi
 
       i=$((i - 1))
-      if (( i > 0 ));then
+      if [ $i -gt 0 ]; then
           sleep 2
       else
           break

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[10665] xcat-core/trunk/xCAT/postscripts/syslog

From: <otubo@us...> - 2011-09-28 19:14

Revision: 10665
          http://xcat.svn.sourceforge.net/xcat/?rev=10665&view=rev
Author:   otubo
Date:     2011-09-28 19:14:42 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Adding support for Ubuntu on syslog script

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2011-09-28 18:15:11 UTC (rev 10664)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2011-09-28 19:14:42 UTC (rev 10665)
@@ -204,6 +204,16 @@
           echo "*.debug   /var/log/messages  rotate 1024K files 5" >> $conf_file
       fi
     fi
+    
+    #Ubuntu doesn't have sysconfig 
+    # so configuring the MN to receive UDP connections here.
+    if ( pmatch $OSVER "ubuntu*" ); then
+      egrep \('^\$UDPServerRun 514'\|'^\$ModLoad imudp'\) $conf_file > /dev/null 2>&1;
+      if [ $? -eq 1 ]; then
+        echo "\$ModLoad imudp" >> $conf_file;
+        echo "\$UDPServerRun 514" >> $conf_file;
+      fi
+    fi 
   else 
     #now make the syslogd fowarding the messages to the the master
     if [ $ng -eq 1 ]; then
@@ -228,7 +238,12 @@
       if [ $isLinux -eq 0 ]; then
         echo "*.debug @$master" >> $conf_file
       else
-        echo "*.* @$master" >> $conf_file
+        if ( pmatch $OSVER "ubuntu*" ); then
+          echo "\$ModLoad imuxsock" >> $conf_file
+          echo "*.* @$master" >> $conf_file
+        else
+          echo "*.* @$master" >> $conf_file
+        fi 
       fi
     fi
   fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[11720] xcat-core/trunk/xCAT/postscripts/syslog

From: <ligc@us...> - 2012-03-01 09:04

Revision: 11720
          http://xcat.svn.sourceforge.net/xcat/?rev=11720&view=rev
Author:   ligc
Date:     2012-03-01 09:03:55 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
fix for bug 3495915: env var SVLOCAL might be empty

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2012-03-01 07:20:29 UTC (rev 11719)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2012-03-01 09:03:55 UTC (rev 11720)
@@ -203,7 +203,7 @@
   goLocal=1
 else 
   if [ $isSN -eq 1 ]; then
-     if [ $SVLOGLOCAL -eq 1 ]; then
+     if [ -n "$SVLOGLOCAL" ] && [ $SVLOGLOCAL -eq 1 ]; then
        goLocal=1  
      fi
   fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[12252] xcat-core/trunk/xCAT/postscripts/syslog

From: <immarvin@us...> - 2012-04-17 13:01

Revision: 12252
          http://xcat.svn.sourceforge.net/xcat/?rev=12252&view=rev
Author:   immarvin
Date:     2012-04-17 13:01:34 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
fixed defect ID: 3509605 xcatconfig will not setup syslog for xCAT on linux

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2012-04-17 12:52:29 UTC (rev 12251)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2012-04-17 13:01:34 UTC (rev 12252)
@@ -95,7 +95,11 @@
 
   #enable to send the logging to master
   if [ $isLocal -eq 1 ]; then
-       touch  /var/log/messages  
+  #enable the MN to log all the logs from CN and MN itself
+      sed 's/\(^[^\#].*\/var\/log\/messages\)/\#\1/g' $2 >/tmp/sed.tmp
+      cat /tmp/sed.tmp >$2 
+      echo "*.debug  /var/log/messages" >> $2
+      touch  /var/log/messages  
   else
       sed 's/^\(\*\..*\)/\#\1/' $2 >/tmp/sed.tmp
       cat /tmp/sed.tmp >$2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[12687] xcat-core/trunk/xCAT/postscripts/syslog

From: <immarvin@us...> - 2012-05-15 03:41

Revision: 12687
          http://xcat.svn.sourceforge.net/xcat/?rev=12687&view=rev
Author:   immarvin
Date:     2012-05-15 03:41:53 +0000 (Tue, 15 May 2012)
Log Message:
-----------
fix defect :change all logger calls to put xcat msgs into local4 - ID: 3513525

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2012-05-15 03:40:49 UTC (rev 12686)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2012-05-15 03:41:53 UTC (rev 12687)
@@ -313,5 +313,5 @@
 fi
 
 #keep a record
-logger -t xCAT "Install: syslog setup"
+logger -t xCAT -p local4.info "Install: syslog setup"
 exit 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[13147] xcat-core/trunk/xCAT/postscripts/syslog

From: <linggao@us...> - 2012-06-21 20:05

Revision: 13147
          http://xcat.svn.sourceforge.net/xcat/?rev=13147&view=rev
Author:   linggao
Date:     2012-06-21 20:05:22 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
fixed a problem that still logs to localhost for syslog-ng

Modified Paths:
--------------
    xcat-core/trunk/xCAT/postscripts/syslog

Modified: xcat-core/trunk/xCAT/postscripts/syslog
===================================================================
--- xcat-core/trunk/xCAT/postscripts/syslog	2012-06-21 19:46:19 UTC (rev 13146)
+++ xcat-core/trunk/xCAT/postscripts/syslog	2012-06-21 20:05:22 UTC (rev 13147)
@@ -262,6 +262,12 @@
       echo "# xCAT settings" >> $conf_file
       echo "destination loghost { udp(\"$master\"); };" >> $conf_file
       echo 'log { source(src); destination(loghost); };' >> $conf_file
+ 
+      # remove the settings that will log to local files
+      sed -i '/destination messages/s/^/#/'  $conf_file
+      sed -i '/destination(messages)/s/^/#/'  $conf_file
+      sed -i '/destination warn/s/^/#/'  $conf_file
+      sed -i '/destination(warn)/s/^/#/'  $conf_file
     else 
       if [ -f $conf_file.XCATORIG ]; then 
         rm -f $conf_file 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.