saving uncommitted changes in /etc prior to emerge run

diff --git a/group b/group
index 310392a868e1a09b5d163b67130d99d00ae3e339..eb4cb21e0635237a310fd6c3a8d6a1cf0ced6566 100644 (file)
--- a/group
+++ b/group
@@ -30,7 +30,7 @@ ldap:x:439:
 messagebus:x:249:
 lpadmin:x:106:
 cron:x:16:fbrehm
-mail:x:12:
+mail:x:12:postfix
 postmaster:x:105:
 ssmtp:x:104:
 crontab:x:103:
@@ -56,3 +56,5 @@ tcpdump:x:988:
 postgres:x:70:
 kdm:x:987:
 apache:x:81:
+postfix:x:207:
+postdrop:x:208:

diff --git a/group- b/group-
index d4f60a0ee633f220566cf2cb2316cedad0a01402..2ebcf7d1ae50859f27448f1b7e31fccb9a28f3f3 100644 (file)
--- a/group-
+++ b/group-
@@ -55,3 +55,6 @@ scanner:x:989:
 tcpdump:x:988:
 postgres:x:70:
 kdm:x:987:
+apache:x:81:
+postfix:x:207:
+postdrop:x:208:

diff --git a/gshadow b/gshadow
index 8822ba9c97e4bce9abb1362094e91833bc4a563c..7db1d22d9918ba31f326ba4b97e764280d7151b9 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -30,7 +30,7 @@ ldap:!::
 messagebus:!::
 lpadmin:!::
 cron:!::fbrehm
-mail:!::
+mail:!::postfix
 postmaster:!::
 ssmtp:!::
 crontab:!::
@@ -56,3 +56,5 @@ tcpdump:!::
 postgres:!::
 kdm:!::
 apache:!::
+postfix:!::
+postdrop:!::

diff --git a/gshadow- b/gshadow-
index f6d131120c6a39e8710f35d642cc8d829a9e902d..452a9c8c2d7d51a26d8d73c01231f6c6153648dc 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -55,3 +55,6 @@ scanner:!::
 tcpdump:!::
 postgres:!::
 kdm:!::
+apache:!::
+postfix:!::
+postdrop:!::

diff --git a/passwd b/passwd
index ff85feaf01877fedb0c3c5395c82130831d330db..cf1f36781c8f1441e06f0e84793829e38c153b8d 100644 (file)
--- a/passwd
+++ b/passwd
@@ -37,3 +37,4 @@ postgres:x:70:70:added by portage for postgresql-server:/var/lib/postgresql:/bin
 gpsd:x:111:14:added by portage for gpsd:/dev/null:/sbin/nologin
 kdm:x:112:987:added by portage for kdm:/var/lib/kdm:/sbin/nologin
 apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin
+postfix:x:207:207:added by portage for postfix:/var/spool/postfix:/sbin/nologin

diff --git a/passwd- b/passwd-
index 41ee74dd97ea757a7e69fcbd097064af7ecd4771..ff85feaf01877fedb0c3c5395c82130831d330db 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -36,3 +36,4 @@ tcpdump:x:110:988:added by portage for tcpdump:/dev/null:/sbin/nologin
 postgres:x:70:70:added by portage for postgresql-server:/var/lib/postgresql:/bin/bash
 gpsd:x:111:14:added by portage for gpsd:/dev/null:/sbin/nologin
 kdm:x:112:987:added by portage for kdm:/var/lib/kdm:/sbin/nologin
+apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin

diff --git a/shadow b/shadow
index 93d6c00bb2eadfc9a684e16bfd442cba9bf36caf..6f69532a6e502afa62210e8954f0aa724b1b66c1 100644 (file)
--- a/shadow
+++ b/shadow
@@ -36,3 +36,4 @@ postgres:!:15390::::::
 gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
+postfix:!:15391::::::

diff --git a/shadow- b/shadow-
index 0ea2cf33bd09a949bb0a4197a5ede9444417d458..93d6c00bb2eadfc9a684e16bfd442cba9bf36caf 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -35,3 +35,4 @@ tcpdump:!:15390::::::
 postgres:!:15390::::::
 gpsd:!:15390::::::
 kdm:!:15390::::::
+apache:!:15391::::::