saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index e4129aa7f1d2b01758aa040e002534ab3c955409..65a6957d32286034859390fcb147a458c125862b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -36,7 +36,6 @@ mkdir -p './unixODBC/ODBCDataSources'
 maybe chmod 0755 '.'
 maybe chmod 0700 './.etckeeper'
 maybe chmod 0644 './.gitignore'
-maybe chmod 0644 './.passwd.swp'
 maybe chmod 0600 './.pwd.lock'
 maybe chmod 0755 './ConsoleKit'
 maybe chmod 0755 './ConsoleKit/run-seat.d'

diff --git a/passwd b/passwd
index 49db2cfd1eee139f5bb8497060401c1fc8b5341c..f139b9942c9e3b8bfc5aa936cea35b72b5d1818b 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
@@ -30,3 +29,12 @@ 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
 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