From 84df702cf3edbff57664341079934c38e9ea36a3 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 2 Mar 2010 13:31:04 +0000
Subject: [PATCH] fix for defect 2957917

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5332 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/syslog | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index 78d15b5f4..274f9cf3f 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -111,23 +111,23 @@ if [ $isLinux -eq 1 ] && [ -a $sysconfig ]; then
     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