diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-11 12:19:07 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-11 12:19:07 -0700 |
| commit | 82b9cd8e58197cf89e2f6aea5bfdb17625ceb2fe (patch) | |
| tree | 8987076f0e03a52b48ccf29f8c51b034bbba4ca2 | |
| parent | 1eb6b0c45355c54f43b59a3f65b3be2a227bf79a (diff) | |
| parent | e0151173e2754a3f559a1cef8166a4b781e0ab94 (diff) | |
| download | vyatta-cfg-system-82b9cd8e58197cf89e2f6aea5bfdb17625ceb2fe.tar.gz vyatta-cfg-system-82b9cd8e58197cf89e2f6aea5bfdb17625ceb2fe.zip | |
Merge branch 'mendocino' of vm:rel/vyatta-cfg-system into mendocino
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | sysconf/vyatta-log.conf | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 9f0fc305..86e2aec8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ cfgdir = $(datadir)/vyatta-cfg/templates share_perl5dir = $(datarootdir)/perl5/Vyatta/Login -libudevdir = /lib/udev -udevrulesdir = /lib/udev/rules.d bin_sudo_usersdir = $(bindir)/sudo-users curverdir = $(sysconfdir)/config-migrate/current netplugupdir = /etc/netplug/linkup.d @@ -83,9 +81,14 @@ sysconf_DATA += sysconf/pam_radius.cfg sysconf_DATA += sysconf/filecaps sysconf_DATA += sysconf/capability.conf +libudevdir = /lib/udev +udevrulesdir = /lib/udev/rules.d libudev_SCRIPTS = scripts/vyatta_net_name udevrules_DATA = sysconf/69-vyatta-net.rules +rsyslogdir = /etc/rsyslog.d +rsyslog_DATA = sysconf/vyatta-log.conf + curver_DATA = cfg-version/vrrp@1 curver_DATA += cfg-version/system@3 diff --git a/sysconf/vyatta-log.conf b/sysconf/vyatta-log.conf new file mode 100644 index 00000000..77d51a76 --- /dev/null +++ b/sysconf/vyatta-log.conf @@ -0,0 +1 @@ +*.notice;local7.debug -/var/log/messages |