diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2011-06-15 17:59:13 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2011-06-15 17:59:13 -0700 |
| commit | 9d365d92d3eac9e7242a3d2314ca2d86cce89e75 (patch) | |
| tree | 72187efebc3673eefedd4889e303d3b14747465a | |
| parent | c129847cd7bbd2731e5ae83594c7b6d5e1cd1395 (diff) | |
| download | vyatta-cfg-9d365d92d3eac9e7242a3d2314ca2d86cce89e75.tar.gz vyatta-cfg-9d365d92d3eac9e7242a3d2314ca2d86cce89e75.zip | |
Bugfix 6767: Syslog any errors from rmmod instead of writing to log file.
Also rotate the config related log files under /var/log/vyatta so that
they don't fill up the root filesystem.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-router | 2 | ||||
| -rw-r--r-- | etc/logrotate.d/vyatta-config-logs | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8bcd723..f01ea8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = . perl_dmod share_perl5dir = /opt/vyatta/share/perl5/Vyatta completiondir = /etc/bash_completion.d initddir = /etc/init.d +logrotatedir = /etc/logrotate.d defaultdir = /etc/default etc_shell_leveldir = $(sysconfdir)/shell/level dhcphookdir = /etc/dhcp3/dhclient-exit-hooks.d @@ -17,6 +18,7 @@ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c completion_DATA = etc/bash_completion.d/vyatta-cfg initd_SCRIPTS = etc/init.d/vyatta-router dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook +logrotate_DATA = etc/logrotate.d/vyatta-config-logs src/cparse/cparse.cpp: src/cparse/cparse.ypp src/cparse/cparse_def.h bison -p cparse_ --defines=src/cparse/cparse.h -o $@ $< diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index 4fd3f00..e10f054 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -136,7 +136,7 @@ load_bootfile () cleanup_raid() { MD_MODULES='linear multipath raid0 raid1 raid456 raid5 raid6 raid10' - rmmod $MD_MODULES > /tmp/vyatta_raid_cleanup.log 2>&1 + rmmod -s $MD_MODULES } # diff --git a/etc/logrotate.d/vyatta-config-logs b/etc/logrotate.d/vyatta-config-logs new file mode 100644 index 0000000..66cb374 --- /dev/null +++ b/etc/logrotate.d/vyatta-config-logs @@ -0,0 +1,6 @@ +/var/log/vyatta/cfg-stderr.log /var/log/vyatta/cfg-stdout.log /var/log/vyatta/vyatta-commit.log /var/log/vyatta/vyatta-config-loader.log { + nocompress + size 1M + rotate 2 + create 664 root vyattacfg +} |