Update rsyslog.default to the changes introduced by v3.

- Remove obsolete RKLOGD_OPTIONS configuration variable.
- Document deprecated command line options.
- Start rsyslogd in v3 compat mode, its native interface.

2 files changed, 8 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 88e1de0..f395089 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ rsyslog (3.14.1-1) unstable; urgency=low
       and has replaced the separate rklogd binary. Remove all traces of rklogd
       from the init script.
     - General cleanup and simplification.
+  * debian/rsyslog.default
+    - Remove obsolete RKLOGD_OPTIONS configuration variable.
+    - Document deprecated command line options.
+    - Start rsyslogd in v3 compat mode, its native interface.
 
  -- Michael Biebl <biebl@debian.org>  Sun, 06 Apr 2008 16:54:08 +0200
 
diff --git a/debian/rsyslog.default b/debian/rsyslog.default
index 4c81b93..fe4b6e8 100644
--- a/debian/rsyslog.default
+++ b/debian/rsyslog.default
@@ -1,14 +1,8 @@
 # Options for rsyslogd
-# -m 0 disables 'MARK' messages.
-# -r enables logging from remote machines
+# -m 0 disables 'MARK' messages (deprecated, only used in compat mode < 3)
+# -r enables logging from remote machines (deprecated, only used in compat mode < 3)
 # -x disables DNS lookups on messages recieved with -r
+# -c compatibilty mode
 # See rsyslogd(8) for more details
-RSYSLOGD_OPTIONS="-m 0"
-
-# Options for rklogd
-# -2 prints all kernel oops messages twice; once for klogd to decode, and
-#    once for processing with 'ksymoops'
-# -x disables all klogd processing of oops messages entirely
-# See rklogd(8) for more details
-RKLOGD_OPTIONS="-x"
+RSYSLOGD_OPTIONS="-c3"