saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index fb650d951fd3bfc7459a8bca30354f329eadf201..809e16e48c8a0d3e4b336b8d4188575a934f0aa8 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -8,6 +8,7 @@ mkdir -p './sudoers.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 './.etckeeper'
 maybe chmod 0644 './.gitignore'
+maybe chmod 0644 './.make.conf.swp'
 maybe chmod 0600 './.pwd.lock'
 maybe chmod 0644 './DIR_COLORS'
 maybe chmod 0600 './aiccu.conf'

diff --git a/make.conf b/make.conf
index b769a158d1118969b9e29013830ec166ea4331c4..019a1827b213741d8365cbe6a0136daf9993794a 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -56,7 +56,31 @@ LINGUAS="de en en_GB en_US ru vi"
 
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.
-USE="bash-completion git mmx perl sse sse2 subversion xml"
+USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards 
+     amr ao aqua archive audiofile bash-completion bazaar branding bzip2 cairo 
+     calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl 
+     curlwrappers cvs dbase dbus dga djvu dts dv dvb dvd dvdr dvdread eds examples
+     encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig
+     foomaticdb ftp gconf gd gd-external ggi gif gimp git glade glib gmp gnome gnome-keyring 
+     gnustep gnutls gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea
+     idn ieee1394 imagemagick imap imlib inifile ithreads java javascript
+     jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs
+     keyring kig-scripting kpathsea lame latex lcms ldap
+     libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial
+     mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp
+     musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis
+     nptl nsplugin odbc ogg openal openexr opengl pango par pch pcntl pcre pdf perl
+     perlsuid php plasma plotutils png policykit posix ppds projectm pulseaudio python qt3 qt4 quicktime real
+     rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp
+     sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh
+     subversion svg sysvipc tetex theora thumbnail tidy timidity tiff
+     tools truetype twolame udev unicode usb v4l v4l2 vcd vidix video vim-syntax vorbis  wav wavpack
+     wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine
+     xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xulrunner xvid yahoo
+     yaz yv12 zeroconf zlib 
+     "
+
+# apache2 avahi darcs doc kate kde kdeenablefinal kdeprefix kerberos skey threads
 
 #USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altenburgcards 
 #     amr ao apache2 aqua archive audiofile avahi bash-completion bazaar branding bzip2 cairo

diff --git a/make.profile b/make.profile
index 2f6c922c5365a180ecefee497927e19bef2bd568..0cf73b4993487960e3e2e92a067fb92f0b3dc822 120000 (symlink)
--- a/make.profile
+++ b/make.profile
@@ -1 +1 @@
-../usr/portage/profiles/default/linux/amd64/10.0
\ No newline at end of file
+../usr/portage/profiles/default/linux/amd64/10.0/desktop
\ No newline at end of file

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 234ee5d6d3230a8b7845c5dad8f20b42007825c6..348e800750556b541e1c2687dad930d99472d987 100644 (file)
--- a/ulogd.conf
+++ b/ulogd.conf
@@ -11,7 +11,7 @@
 nlgroup=1
 
 # logfile for status messages
-logfile="/var/log/ulogd.log"
+logfile="/var/log/fw/ulogd.log"
 
 # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8)
 loglevel=5
@@ -50,11 +50,13 @@ plugin="/usr/lib64/ulogd/ulogd_LOGEMU.so"
 
 
 [LOGEMU]
-file="/var/log/ulogd.syslogemu"
+#file="/var/log/ulogd.syslogemu"
+file="/var/log/fw/iptables.log"
 sync=1
 
 [OPRINT]
-file="/var/log/ulogd.pktlog"
+#file="/var/log/ulogd.pktlog"
+file="/var/log/fw/ulogd.pktlog"
 
 [MYSQL]
 table="ulog"