[rhel6-branch] Fix rsyslogd calls to remove deprecated flag. (#1104234)

Samantha N. Bueno sbueno+anaconda at redhat.com
Tue Jun 3 15:11:52 UTC 2014


Rsyslog is being rebased to a version which no longer supports -c, so
just remove it. We're not doing anything special anyway.

Resolve: rhbz#1104234
---
 loader/init.c       | 2 +-
 loader/linuxrc.s390 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/loader/init.c b/loader/init.c
index 7c5bcc8..53b7a15 100644
--- a/loader/init.c
+++ b/loader/init.c
@@ -172,7 +172,7 @@ static void startSyslog(void) {
     klogctl(8, NULL, 1);
     /* now we really start the daemon. */
     int status;
-    status = system("/sbin/rsyslogd -c 4");
+    status = system("/sbin/rsyslogd");
     if (status < 0 || 
         !WIFEXITED(status) || 
         WEXITSTATUS(status)  != 0) {
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 95e9499..94ba4c0 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -339,7 +339,7 @@ function init_main() {
 
         # start rsyslogd after mount of /tmp ramfs since it logs to /tmp/syslog
         echo $"Starting rsyslogd..."
-        rsyslogd -c 4
+        rsyslogd
 
         ifconfig lo 127.0.0.1 netmask 255.0.0.0
         route add -host 127.0.0.1 dev lo
-- 
1.8.3.1



More information about the anaconda-patches mailing list