saving uncommitted changes in /etc prior to emerge run

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/passwd- b/passwd-
index f611ee75dae15b034effcabf2e7d7ab3e9447af6..da0719c81a8826a85e21213bac33e91aa060703f 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -16,7 +16,6 @@ sshd:x:22:22:added by portage for openssh:/var/empty:/sbin/nologin
 cron:x:16:16:added by portage for cronbase:/var/spool/cron:/sbin/nologin
 mail:x:8:12:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postmaster:x:14:249:added by portage for mailbase:/var/spool/mail:/sbin/nologin
-frank:x:1000:100:Frank Brehm:/home/frank:/bin/bash
 ntp:x:123:123:added by portage for ntp:/dev/null:/sbin/nologin
 messagebus:x:101:122:added by portage for dbus:/dev/null:/sbin/nologin
 ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin
@@ -29,3 +28,14 @@ games:x:36:35:added by portage for moon-buggy:/usr/games:/bin/bash
 radvd:x:105:998:added by portage for radvd:/dev/null:/sbin/nologin
 openvpn:x:106:997:added by portage for openvpn:/dev/null:/sbin/nologin
 at:x:25:25:added by portage for at:/var/spool/at/atjobs:/sbin/nologin
+named:x:40:40:added by portage for bind:/etc/bind:/sbin/nologin
+tcpdump:x:107:996:added by portage for tcpdump:/dev/null:/sbin/nologin
+pcguest:x:999:65534:Guest user for Samba:/home/pcguest:/bin/false
+frank:x:1000:100:Frank Brehm:/home/frank:/bin/bash
+doris:x:1003:100:Doris Hennig:/home/doris:/bin/bash
+heiko:x:1005:100:Heiko Hennig:/home/heiko:/bin/bash
+patrick:x:1004:100:Patrick Hennig:/home/patrick:/bin/bash
+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

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::::::

diff --git a/shadow- b/shadow-
index 96314f8d97352947e0a13bf184f9a18a94914036..1c942e610df842fbc2574d3cc5701835483f14c6 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -15,7 +15,6 @@ sshd:!:15351::::::
 cron:!:15354::::::
 mail:!:15354::::::
 postmaster:!:15354::::::
-frank:$6$cX.uoegn$QJ4gODV46s22yZL5568YNM/TqhlRqVOK42ulOijyMRZN4A049BLsbTB/M/8XO/rJwFs8w4sSS7mEPsdZtyzQI1:15354:0:99999:7:::
 ntp:!:15354::::::
 messagebus:!:15354::::::
 ldap:!:15354::::::
@@ -28,3 +27,14 @@ games:!:15355::::::
 radvd:!:15355::::::
 openvpn:!:15355::::::
 at:!:15355::::::
+named:!:14145:0:99999:7:::
+tcpdump:!:15355::::::
+pcguest:!:15352::::::
+frank:$6$cX.uoegn$QJ4gODV46s22yZL5568YNM/TqhlRqVOK42ulOijyMRZN4A049BLsbTB/M/8XO/rJwFs8w4sSS7mEPsdZtyzQI1:15354:0:99999:7:::
+doris:$1$UG2z0RVy$TmokHK2qkhMYdl82YgriC1:14147:0:99999:7:::
+heiko:$1$jI8r4jt2$BrVSxlQMrtsSmnia1zqOd/:14147:0:99999:7:::
+patrick:$1$GLbMMbFN$CAnFjqpvABrKPsMgioPbx0:14147:0:99999:7:::
+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:::