From: frank Date: Sun, 22 Jan 2012 21:13:38 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=cb9c1a8b9a9dc478835322d8517e8581d4a697c5;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng index 170862fb..9c7eade5 100644 --- a/conf.d/syslog-ng +++ b/conf.d/syslog-ng @@ -3,4 +3,6 @@ # Put any additional options for syslog-ng here. # See syslog-ng(8) for more information. +#rc_after="net" + SYSLOG_NG_OPTS="" diff --git a/cups/printers.conf b/cups/printers.conf index 7369b104..f64ce7dd 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-22 08:53 +# Written by cupsd on 2012-01-22 14:02 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 9bfb9f96..4696170f 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-21 21:08 +# Written by cupsd on 2012-01-22 13:32 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/motd b/motd index b9c2ca02..e17c46e2 100644 --- a/motd +++ b/motd @@ -7,9 +7,11 @@ Gentoo Base System release 2.0.3 |____/|_| \__,_|_| |_|_| -Es mag zu meinem Vorteil oder Nachteil ausfallen, ich fürchte nicht, -so gesehen zu werden, wie ich bin. - -- Jean Jacques Rousseau (an Malesherbes, 1762) +Sicherlich würde das menschliche Leben weit glücklicher verlaufen, +wenn der Mensch ebenso gut zu schweigen wie zu reden vermöchte. Aber +die Erfahrung lehrt uns mehr als genug, daß der Mensch nichts so +schwer beherrscht wie seine Zunge. + -- Baruch de Spinoza -Today is Sweetmorn, the 21st day of Chaos in the YOLD 3178 +Today is Boomtime, the 22nd day of Chaos in the YOLD 3178 diff --git a/rc.conf b/rc.conf index acc4b3cb..9a85e8e8 100644 --- a/rc.conf +++ b/rc.conf @@ -8,12 +8,14 @@ # the boot process. Don't file bugs about this unless you can supply # patches that fix it without breaking other things! #rc_parallel="NO" +rc_parallel="YES" # Set rc_interactive to "YES" and you'll be able to press the I key during # boot so you can choose to start specific services. Set to "NO" to disable # this feature. This feature is automatically disabled if rc_parallel is # set to YES. #rc_interactive="YES" +rc_interactive="YES" # If we need to drop to a shell, you can specify it here. # If not specified we use $SHELL, otherwise the one specified in /etc/passwd,