saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index edb33a8004fc8eb6642db12cb740681fe058a472..9a7ec2a29ab6870fbc7ea3b769be87df37504a44 100644 (file)
--- 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-26 07:42
+# Written by cupsd on 2012-01-28 14:23
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 017e35eba0a755b4ff3de8cbf1fcf40b123e013f..a467c0d6e466375bcee97ad8aabcfcf534350d18 100644 (file)
--- 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-25 08:02
+# Written by cupsd on 2012-01-27 08:13
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 3f4fbd6b75e94d906b43062c7b575b64ca3e9390..8ca29e055ba5b01cdcafc1228e800cd16ad34465 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-01-21 21:08
-NextSubscriptionId 123
+# Written by cupsd on 2012-01-28 14:23
+NextSubscriptionId 125

diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
index 4e6c39aa21dee4993d925bdcdbff0c8baf328b6a..fb889dde5550e06527d268d48bb9c44e566bb546 100644 (file)
--- a/cups/subscriptions.conf.O
+++ b/cups/subscriptions.conf.O
@@ -1,27 +1,19 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-01-18 23:52
-NextSubscriptionId 123
-<Subscription 120>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner heiko
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1327000851
-NextEventId 1
-</Subscription>
-<Subscription 121>
+# Written by cupsd on 2012-01-26 21:19
+NextSubscriptionId 125
+<Subscription 123>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
 Owner doris
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1327002991
+ExpirationTime 1327690029
 NextEventId 1
 </Subscription>
-<Subscription 122>
+<Subscription 124>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
 Owner doris
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1327005279
+ExpirationTime 1327695553
 NextEventId 1
 </Subscription>

diff --git a/motd b/motd
index 2b77eb927d32b130269a03a565c2a840eca56841..22a4e1034ab3819a799e1148322697821e38c020 100644 (file)
--- a/motd
+++ b/motd
@@ -7,17 +7,8 @@ Gentoo Base System release 2.0.3
 |____/|_|   \__,_|_| |_|_|
                           
 
-Die ersten Christen müssen schon ein ziemlich schlechtes Bild von sich
-gegeben haben, wenn man sie der Menschenfresserei beschuldigte. Ich
-meinerseits muß gestehen, mir wäre es lieber, wenn sie damals ein oder
-zwei kleine Jungen gefressen hätten, statt so viele Unschuldige zu
-verbrennen, die Massaker der Albigenser, der Einwohner von Mérindol
-und Carbrières, der Bartholomäusnacht und so viele andere Greueltaten
-zu begehen. Dieser Schandfleck ist unser besonderes Kennzeichen.
-Unsere Religion muß schon sehr wahr sein, da niemals der Gedanke
-aufgetaucht ist, daß man ihr vielleicht schaden könnte, wenn man sie
-in dieser Weise predigte.
-               -- François Marie Voltaire
+Arbeit: eines der Verfahren, durch das A dem B Eigentum erwirbt.
+               -- Ambrose Gwinnet Bierce (Des Teufels Wörterbuch)
 
-Today is Sweetmorn, the 26th day of Chaos in the YOLD 3178
+Today is Pungenday, the 28th day of Chaos in the YOLD 3178
 

diff --git a/rc.conf b/rc.conf
index 2e5c1c41e731ba8d79dcb13d35c99dc0d72514bd..9d8afee382e966723a869f69b9df8d89a9ad84c5 100644 (file)
--- a/rc.conf
+++ b/rc.conf
@@ -140,7 +140,7 @@ unicode="YES"
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""
+rc_sys=""
 
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)