From d3a029156ac4e395dbdd843b13cc9536b53031dc Mon Sep 17 00:00:00 2001 From: nott Date: Mon, 18 Feb 2008 14:24:55 +0000 Subject: [PATCH] Fix syslog setup code. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@502 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/sbin/xcatconfig | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/xCAT-server-2.0/sbin/xcatconfig b/xCAT-server-2.0/sbin/xcatconfig index b1226983c..aa358cf0a 100644 --- a/xCAT-server-2.0/sbin/xcatconfig +++ b/xCAT-server-2.0/sbin/xcatconfig @@ -369,19 +369,27 @@ if (( ! -r "/etc/xcat/policy.sqlite" ) || $::FORCE) { } # setup syslog -cp /etc/syslog.conf /etc/syslog.conf.ORIG -echo "*.debug /var/log/localmessages" > /etc/test.tmp -echo "*.crit /var/log/localmessages" >> /etc/test.tmp -cat /etc/test.tmp >> /etc/syslog.conf -rm /etc/test.tmp -touch /var/log/localmessages - +my $syslogcmds; +$syslogcmds = "cp /etc/syslog.conf /etc/syslog.conf.ORIG;"; +$syslogcmds .= "echo '*.debug /var/log/localmessages' > /etc/test.tmp;"; +$syslogcmds .= "echo '*.crit /var/log/localmessages' >> /etc/test.tmp;"; +$syslogcmds .= "cat /etc/test.tmp >> /etc/syslog.conf;"; +$syslogcmds .= "rm /etc/test.tmp;"; +$syslogcmds .= "touch /var/log/localmessages;"; if ($::osname eq 'AIX') { - stopsrc -s syslogd - startsrc -s syslogd + $syslogcmds .= "stopsrc -s syslogd;"; + $syslogcmds .= "startsrc -s syslogd;"; } else { - /etc/rc.d/init.d/syslog stop - /etc/rc.d/init.d/syslog start + $syslogcmds .= "/etc/rc.d/init.d/syslog stop;"; + $syslogcmds .= "/etc/rc.d/init.d/syslog start;"; +} + +my $outref = xCAT::Utils->runcmd("$syslogcmds", 0); +if ($::RUNCMD_RC != 0) +{ + xCAT::MsgUtils->message('E', "Could not set up syslog.\n"); +} else { + xCAT::MsgUtils->message('I', "Started syslog daemon.\n"); } #