saving uncommitted changes in /etc prior to emerge run

diff --git a/group b/group
index d1cb8121f8ff0813f5721371e4f00ce8bb833942..d41f185d7fb061d9c74c0ba66335c20b41d1937b 100644 (file)
--- a/group
+++ b/group
@@ -52,3 +52,4 @@ named:x:40:
 tcpdump:x:996:
 scanner:x:995:
 polkituser:x:1000:
+kdm:x:994:

diff --git a/group- b/group-
index 1181243f36645fa32c63d557f03e39d69d7ab04d..d1cb8121f8ff0813f5721371e4f00ce8bb833942 100644 (file)
--- a/group-
+++ b/group-
@@ -1,22 +1,22 @@
-root:x:0:root
+root:x:0:root,frank
 bin:x:1:root,bin,daemon
 daemon:x:2:root,bin,daemon
 sys:x:3:root,bin,adm
 adm:x:4:root,adm,daemon
-tty:x:5:
+tty:x:5:frank,heiko,patrick,vivi,doris,robert,steffen
 disk:x:6:root,adm
-lp:x:7:lp
+lp:x:7:lp,frank,heiko,patrick,vivi,doris,robert,steffen
 mem:x:8:
 kmem:x:9:
-wheel:x:10:root
+wheel:x:10:root,frank,heiko,patrick,vivi,doris,robert,steffen
 floppy:x:11:root
 news:x:13:news
 uucp:x:14:uucp
 console:x:17:
-audio:x:18:pulse
-cdrom:x:19:
+audio:x:18:pulse,frank,heiko,patrick,vivi,doris,robert,steffen
+cdrom:x:19:frank,heiko,patrick,vivi,doris,robert,steffen
 tape:x:26:root
-video:x:27:root
+video:x:27:root,frank,heiko,patrick,vivi,doris,robert,steffen
 cdrw:x:80:
 usb:x:85:
 users:x:100:
@@ -26,12 +26,12 @@ nogroup:x:65533:
 nobody:x:65534:
 man:x:15:
 sshd:x:22:
-cron:x:16:
+cron:x:16:frank,heiko,patrick,vivi,doris,robert,steffen
 mail:x:12:
 postmaster:x:249:
 ssmtp:x:248:
 crontab:x:247:
-locate:x:246:
+locate:x:246:frank,heiko,patrick,vivi,doris,robert,steffen
 ntp:x:123:
 messagebus:x:122:
 ldap:x:439:
@@ -44,8 +44,11 @@ apache:x:81:
 netdev:x:102:
 avahi:x:101:
 avahi-autoipd:x:999:
-games:x:35:
+games:x:35:frank,heiko,patrick,vivi,doris,robert,steffen
 radvd:x:998:
 openvpn:x:997:
 at:x:25:
+named:x:40:
 tcpdump:x:996:
+scanner:x:995:
+polkituser:x:1000:

diff --git a/gshadow b/gshadow
index 57fb7e4f138e63edad1898dc791927ad3f6cc101..07d77aabb36bd9033c5480b8a8831ae92044a850 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -50,3 +50,4 @@ openvpn:!::
 at:!::
 tcpdump:!::
 scanner:!::
+kdm:!::

diff --git a/gshadow- b/gshadow-
index 8efa309951c8e5e60398ebac613ea9cc4c5bb0b6..57fb7e4f138e63edad1898dc791927ad3f6cc101 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -49,3 +49,4 @@ radvd:!::
 openvpn:!::
 at:!::
 tcpdump:!::
+scanner:!::

diff --git a/motd b/motd
index 293c051e89d9bcbc683d7cb7a094e2534e541a7a..de3f6431af80fcc4fc51c12f22a9a813f2a78147 100644 (file)
--- a/motd
+++ b/motd
@@ -7,9 +7,8 @@ Gentoo Base System release 2.0.3
 |____/|_|   \__,_|_| |_|_|
                           
 
-Hoffentlich kann man hier mit Logik argumentieren.
-Ich versuch's einfach mal.
-               -- Klaus Knopper
+F: Was ist orange und bohrt sich in die Wand?
+A: Eine BOrange!
 
 Today is Boomtime, the 17th day of Chaos in the YOLD 3178
 

diff --git a/passwd b/passwd
index a3c622d56cf06086fa61fb68d0f0ec46eb026eaa..90a02b9dcf3a0b008f84088043ea77902a165f0a 100644 (file)
--- a/passwd
+++ b/passwd
@@ -40,3 +40,4 @@ thomas:x:1002:100:Thomas Schmidt:/home/thomas:/bin/bash
 vivi:x:1006:100:Vivien Winkler:/home/vivi:/bin/bash
 steffen:x:1008:1008:Steffen Brehm:/home/steffen:/bin/bash
 timidity:x:108:18:added by portage for timidity++:/var/lib/timidity:/sbin/nologin
+kdm:x:109:994:added by portage for kdm:/var/lib/kdm:/sbin/nologin

diff --git a/passwd- b/passwd-
index da0719c81a8826a85e21213bac33e91aa060703f..a3c622d56cf06086fa61fb68d0f0ec46eb026eaa 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -39,3 +39,4 @@ robert:x:1007:100:Robert Meusel:/home/robert:/bin/bash
 thomas:x:1002:100:Thomas Schmidt:/home/thomas:/bin/bash
 vivi:x:1006:100:Vivien Winkler:/home/vivi:/bin/bash
 steffen:x:1008:1008:Steffen Brehm:/home/steffen:/bin/bash
+timidity:x:108:18:added by portage for timidity++:/var/lib/timidity:/sbin/nologin

diff --git a/shadow b/shadow
index ade5e8965bf08e3a68f7736bc03f41f9d63d6ac9..c8a323a77202ced2d36af0ca72832dc4108e3c9f 100644 (file)
--- a/shadow
+++ b/shadow
@@ -39,3 +39,4 @@ thomas:!$1$TnH.ZwKd$6fG79iLoCvVzMC5DGSzmL.:14147:0:99999:7:::
 vivi:$1$E5UMs24X$g/xNaGJFgTK1uB9xVZOGc1:14147:0:99999:7:::
 steffen:$6$l6EVLY86$j9aCQ8smEOrsH/ccQM1r.qQXZxCBazpcCxQe0e1LKYl5oycf7gcBWB.Bx5kqw5gqS7MkiKik69TEAObmPNXfy0:14772:0:99999:7:::
 timidity:!:15356::::::
+kdm:!:15356::::::

diff --git a/shadow- b/shadow-
index 1c942e610df842fbc2574d3cc5701835483f14c6..ade5e8965bf08e3a68f7736bc03f41f9d63d6ac9 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -38,3 +38,4 @@ robert:$1$3dN7L0X7$wjwYf5TMs4XAzX8yA8iRz0:14147:0:99999:7:::
 thomas:!$1$TnH.ZwKd$6fG79iLoCvVzMC5DGSzmL.:14147:0:99999:7:::
 vivi:$1$E5UMs24X$g/xNaGJFgTK1uB9xVZOGc1:14147:0:99999:7:::
 steffen:$6$l6EVLY86$j9aCQ8smEOrsH/ccQM1r.qQXZxCBazpcCxQe0e1LKYl5oycf7gcBWB.Bx5kqw5gqS7MkiKik69TEAObmPNXfy0:14772:0:99999:7:::
+timidity:!:15356::::::