~ubuntu-branches/ubuntu/karmic/rsyslog/karmic

Viewing all changes in revision 19.

  • Committer: James Westby
  • Author(s): Michael Terry
  • Date: 2009-08-14 10:52:59 UTC
  • mfrom: (3.2.9 sid)
  • Revision ID: james.westby@canonical.com-20090814105259-4hxj1qdeu3ckfo7t
Tags: 4.2.0-2ubuntu1
Merge from debian unstable

Remaining changes:
- Run as rsyslog:rsyslog
- Allow reading /proc/kmsg when non-root
- Cleanly upgrade from sysklogd

debian/patches/deroot.patch: Don't allow using the klogctl function to
read klog messages.  Rather, allow /proc/kmsg or nothing, since we have
special support for reading /proc/kmsg while unprivileged.

[ Neil Wilson ]
debian/rsyslog.init: Set blocksize for dd (LP: #407862) and restore
reload init argument to original lightweight reload

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: