saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index beb26d17824b9be9f75d7eeaaa41f2577a81d098..89b46af38e9049a45b5b3e13dd396462f1327b9f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1000,7 +1000,8 @@ maybe chmod 0755 './udev/rules.d'
 maybe chmod 0644 './udev/rules.d/.keep_sys-fs_udev-0'
 maybe chmod 0644 './udev/rules.d/70-persistent-cd.rules'
 maybe chmod 0644 './udev/udev.conf'
-maybe chmod 0644 './ulogd.conf'
+maybe chgrp ulogd './ulogd.conf'
+maybe chmod 0640 './ulogd.conf'
 maybe chmod 0755 './unixODBC'
 maybe chmod 0755 './unixODBC/ODBCDataSources'
 maybe chmod 0644 './unixODBC/odbc.ini'

diff --git a/logrotate.d/ulogd b/logrotate.d/ulogd
index b3fb6d12d5af613fa2664b64d035761e83785388..52a5d764d7a060500e1b0f7f28f4036939a2ca41 100644 (file)
--- a/logrotate.d/ulogd
+++ b/logrotate.d/ulogd
@@ -1,7 +1,23 @@
-/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap {
-    missingok
+#/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap {
+#    missingok
+#    sharedscripts
+#    postrotate
+#      /bin/killall -HUP ulogd 2> /dev/null || true
+#    endscript
+#}
+
+/var/log/ulogd/*.log {
+    daily
+    maxage 2y
+    rotate 999
+    olddir /var/log/ulogd/%Y-%m
+    size 4M
     sharedscripts
     postrotate
-       /bin/killall -HUP ulogd 2> /dev/null || true
+        /etc/init.d/ulogd restart
+               #/bin/killall -HUP ulogd 2> /dev/null || true
     endscript
 }
+
+
+# vim: ts=4 filetype=conf

diff --git a/motd b/motd
index e6af94c036cb9a12481d81825b533944af66d025..5cced35272ba9f74574d056a0156a9a9ed2de2f5 100644 (file)
--- a/motd
+++ b/motd
@@ -7,9 +7,11 @@ Gentoo Base System release 2.0.3
  \___/|_| |_|\__,_| |_|
                        
 
-Hey, sonst denkt ihr auch immer, Joey wäre eine multiple
-Persönlichkeit.  Dann zählt die gefälligst auch so.
-               -- Martin Schulze
+"Das Schwein trägt seinen Namen nicht umsonst" - Stilblüten aus
+Kinderaufsätzen:  (Naturwissenschaft und Mathematik)
+
+Die Astronauten haben auch entdeckt, daß das Hinterteil vom Mond auch
+nicht so glatt und rund ist.
 
 Today is Pungenday, the 28th day of Chaos in the YOLD 3178
 

diff --git a/runlevels/default/ulogd b/runlevels/default/ulogd
new file mode 120000 (symlink)
index 0000000..23bca12
--- /dev/null
+++ b/runlevels/default/ulogd
@@ -0,0 +1 @@
+/etc/init.d/ulogd
\ No newline at end of file

diff --git a/ulogd.conf b/ulogd.conf
index bd72e6b7d2557bebca275e88534bb24fa82533f8..9f742c32b98ce2e99751f4b4d3b1883e8b60badb 100644 (file)
--- a/ulogd.conf
+++ b/ulogd.conf
@@ -9,10 +9,10 @@
 
 
 # logfile for status messages
-logfile="/var/log/ulogd.log"
+logfile="/var/log/ulogd/ulogd.log"
 
 # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8)
-loglevel=1
+loglevel=3
 
 ######################################################################
 # PLUGIN OPTIONS
@@ -26,7 +26,7 @@ loglevel=1
 
 
 plugin="/usr/lib64/ulogd/ulogd_inppkt_NFLOG.so"
-#plugin="/usr/lib64/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib64/ulogd/ulogd_inppkt_ULOG.so"
 plugin="/usr/lib64/ulogd/ulogd_inpflow_NFCT.so"
 plugin="/usr/lib64/ulogd/ulogd_filter_IFINDEX.so"
 plugin="/usr/lib64/ulogd/ulogd_filter_IP2STR.so"
@@ -47,13 +47,13 @@ plugin="/usr/lib64/ulogd/ulogd_output_XML.so"
 plugin="/usr/lib64/ulogd/ulogd_raw2packet_BASE.so"
 
 # this is a stack for logging packet send by system via LOGEMU
-#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for packet-based logging via LOGEMU
-#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for ULOG packet-based logging via LOGEMU
-#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for packet-based logging via LOGEMU with filtering on MARK
 #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
@@ -146,15 +146,15 @@ nlgroup=1
 #numeric_label=0 # optional argument
 
 [emu1]
-file="/var/log/ulogd_syslogemu.log"
+file="/var/log/ulogd/syslogemu.log"
 sync=1
 
 [op1]
-file="/var/log/ulogd_oprint.log"
+file="/var/log/ulogd/oprint.log"
 sync=1
 
 [xml1]
-directory="/var/log/"
+directory="/var/log/ulogd/"
 sync=1
 
 [pcap1]