diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/copy-anaconda-logs e-smith-base-5.4.0/root/etc/e-smith/events/actions/copy-anaconda-logs --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/copy-anaconda-logs 2007-01-19 14:33:20.000000000 -0700 +++ e-smith-base-5.4.0/root/etc/e-smith/events/actions/copy-anaconda-logs 2013-03-16 10:11:33.106970436 -0600 @@ -19,10 +19,17 @@ NOW=$(date +%Y%m%d%H%M%S) LIST=' + /root/install.log + /root/install.log.syslog /root/upgrade.log /root/upgrade.log.syslog + /var/log/anaconda.ifcfg.log /var/log/anaconda.log - /var/log/anaconda.syslog' + /var/log/anaconda.ifcfg.log + /var/log/anaconda.program.log + /var/log/anaconda.storage.log + /var/log/anaconda.syslog + /var/log/anaconda.yum.log' for i in $LIST do diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/purge-old-logs e-smith-base-5.4.0/root/etc/e-smith/events/actions/purge-old-logs --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/purge-old-logs 2007-01-19 14:33:22.000000000 -0700 +++ e-smith-base-5.4.0/root/etc/e-smith/events/actions/purge-old-logs 2013-03-16 10:09:18.822606835 -0600 @@ -28,15 +28,15 @@ my $cdb = esmith::ConfigDB->open_ro; -my $syslog = $cdb->get('syslog') or die "No syslog db entry found"; -my $length = $syslog->prop('PurgeLength') || '95'; +my $rsyslog = $cdb->get('rsyslog') or die "No rsyslog db entry found"; +my $length = $rsyslog->prop('PurgeLength') || '95'; $ENV{'PATH'} = "/bin"; #---------------------------------------------------------------------- # Find all files in /var/log/ that are: # - real files -# - older than syslog{PurgeLength}, or 95 days if unset +# - older than rsyslog{PurgeLength}, or 95 days if unset # - matches our log naming scheme # and eliminate them. #---------------------------------------------------------------------- diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/rotate_timestamped_logfiles e-smith-base-5.4.0/root/etc/e-smith/events/actions/rotate_timestamped_logfiles --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 2008-03-26 10:48:59.000000000 -0600 +++ e-smith-base-5.4.0/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 2013-03-16 10:09:21.682614532 -0600 @@ -48,7 +48,7 @@ s/^\.//; my $filename = $_; - # Set up filenames to be used by syslog. We first set up symlinks + # Set up filenames to be used by rsyslog. We first set up symlinks # with known names, then use the value of the symlink when we # expand the configuration files my $time = time(); diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/tests/10e-smith-base/configuration.conf e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/tests/10e-smith-base/configuration.conf 2005-11-20 21:28:10.000000000 -0700 +++ e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf 2013-03-16 10:11:54.260028102 -0600 @@ -96,6 +96,6 @@ squid=service|InitscriptOrder|90|status|enabled sshd=service|InitscriptOrder|85|PasswordAuthentication|yes|PermitRootLogin|yes|access|private|status|enabled sync=service|Host|service.e-smith.com|LastId|0|SuccessId|0|SyncFrequency|1|SyncMinute|57|status|disabled -syslog=service|InitscriptOrder|05|status|enabled +rsyslog=service|InitscriptOrder|05|status|enabled telnet=service|access|private|status|disabled wibble=42 diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/rc.d/init.d/bootstrap-console e-smith-base-5.4.0/root/etc/rc.d/init.d/bootstrap-console --- e-smith-base-5.4.0.rsyslog/root/etc/rc.d/init.d/bootstrap-console 2007-01-26 18:56:31.000000000 -0700 +++ e-smith-base-5.4.0/root/etc/rc.d/init.d/bootstrap-console 2013-03-16 10:12:26.702116063 -0600 @@ -42,10 +42,10 @@ yes) /sbin/e-smith/bootstrap-console console ;; - no) # And now we'd better restart syslog which + no) # And now we'd better restart rsyslog which # may have been configured before the changes in the # console - /etc/rc.d/init.d/syslog restart + /etc/rc.d/init.d/rsyslog restart break ;; esac diff -ruN e-smith-base-5.4.0.rsyslog/root/var/service/syslog/run e-smith-base-5.4.0/root/var/service/syslog/run --- e-smith-base-5.4.0.rsyslog/root/var/service/syslog/run 2005-11-20 21:28:11.000000000 -0700 +++ e-smith-base-5.4.0/root/var/service/syslog/run 2013-03-16 10:13:29.371288605 -0600 @@ -1,3 +1,3 @@ #! /bin/sh -exec /sbin/syslogd -m 0 -n +exec /sbin/rsyslogd -i /var/run/syslogd.pid -c 5