e-smith-base/sme9/e-smith-base-5.4.0-rsyslog_templates.patch

--- e-smith-base-5.4.0/createlinks      2013-02-25 21:56:34.184688003 +0100
+++ e-smith-base-5.4.0/createlinks      2013-02-25 22:49:32.883135102 +0100
@@ -97,7 +97,7 @@ 
        email-update
        logrotate
        ));
-templates2events("/etc/sysconfig/syslog",  qw(
+templates2events("/etc/sysconfig/rsyslog",  qw(
        console-save
        bootstrap-console-save
        post-install
@@ -105,15 +105,7 @@ 
        email-update
        logrotate
        ));
-templates2events("/etc/syslog.conf",  qw(
-       console-save
-       bootstrap-console-save
-       post-install
-       post-upgrade
-       email-update
-       logrotate
-       ));
-templates2events("/etc/logrotate.d/syslog",  qw(
+templates2events("/etc/rsyslog.conf",  qw(
        console-save
        bootstrap-console-save
        post-install
@@ -524,7 +516,7 @@ 
 event_link("rotate_timestamped_logfiles", $event, "05");
 event_link("purge-old-logs", $event, "75");
 
-safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/syslog");
+safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
 
 #--------------------------------------------------
 # actions for local event
@@ -552,8 +544,8 @@ 
 
 my %service2order =
 (
-    # Start syslog up before network!
-    syslog     => "05",
+    # Start rsyslog up before network!
+    rsyslog    => "05",
     #klogd     => "06",
     cpuspeed           => "06",
     'bootstrap-console'        => "10",
@@ -597,8 +589,3 @@ 
 safe_symlink("/var/service/local" , 'root/service/local');
 safe_touch("root/var/service/local/down");
 
-# Link syslog to rsyslog. Temporary fix.
-safe_symlink("rsyslogd" , 'root/sbin/syslogd');
-safe_symlink("rsyslog"  , 'root/etc/rc.d/init.d/syslog');
-
-
1	--- e-smith-base-5.4.0/createlinks 2013-02-25 21:56:34.184688003 +0100
2	+++ e-smith-base-5.4.0/createlinks 2013-02-25 22:49:32.883135102 +0100
3	@@ -97,7 +97,7 @@
4	email-update
5	logrotate
6	));
7	-templates2events("/etc/sysconfig/syslog", qw(
8	+templates2events("/etc/sysconfig/rsyslog", qw(
9	console-save
10	bootstrap-console-save
11	post-install
12	@@ -105,15 +105,7 @@
13	email-update
14	logrotate
15	));
16	-templates2events("/etc/syslog.conf", qw(
17	- console-save
18	- bootstrap-console-save
19	- post-install
20	- post-upgrade
21	- email-update
22	- logrotate
23	- ));
24	-templates2events("/etc/logrotate.d/syslog", qw(
25	+templates2events("/etc/rsyslog.conf", qw(
26	console-save
27	bootstrap-console-save
28	post-install
29	@@ -524,7 +516,7 @@
30	event_link("rotate_timestamped_logfiles", $event, "05");
31	event_link("purge-old-logs", $event, "75");
32
33	-safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/syslog");
34	+safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
35
36	#--------------------------------------------------
37	# actions for local event
38	@@ -552,8 +544,8 @@
39
40	my %service2order =
41	(
42	- # Start syslog up before network!
43	- syslog => "05",
44	+ # Start rsyslog up before network!
45	+ rsyslog => "05",
46	#klogd => "06",
47	cpuspeed => "06",
48	'bootstrap-console' => "10",
49	@@ -597,8 +589,3 @@
50	safe_symlink("/var/service/local" , 'root/service/local');
51	safe_touch("root/var/service/local/down");
52
53	-# Link syslog to rsyslog. Temporary fix.
54	-safe_symlink("rsyslogd" , 'root/sbin/syslogd');
55	-safe_symlink("rsyslog" , 'root/etc/rc.d/init.d/syslog');
56	-
57	-