This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via c5467c0f3d0446afa84fa106986cf11b98839aab (commit) from fff4b24f4f5c64511559a0d71fa709ce81ecee39 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit c5467c0f3d0446afa84fa106986cf11b98839aab Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 22 20:17:20 2010 +0200

naoki: Hardcode the environment users.

There are differences in the host system that cause the old approach to break.

-----------------------------------------------------------------------

Summary of changes: naoki/chroot.py | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-)

Difference in files: diff --git a/naoki/chroot.py b/naoki/chroot.py index a1888fd..7623c20 100644 --- a/naoki/chroot.py +++ b/naoki/chroot.py @@ -209,22 +209,15 @@ class Environment(object): os.umask(prevMask)

def _setupUsers(self): - ## XXX Could be done better self.log.debug("Creating users") - f = open("/etc/passwd") - g = open(self.chrootPath("etc", "passwd"), "w") - for line in f.readlines(): - if line.startswith("root") or line.startswith("nobody"): - g.write("%s" % line) - g.close() + f = open(self.chrootPath("etc", "passwd"), "w") + f.write("root:x:0:0:root:/root:/bin/bash\n") + f.write("nobody:x:99:99:Nobody:/:/sbin/nologin\n") f.close()

- f = open("/etc/group") - g = open(self.chrootPath("etc", "group"), "w") - for line in f.readlines(): - if line.startswith("root") or line.startswith("nobody"): - g.write("%s" % line) - g.close() + f = open(self.chrootPath("etc", "group"), "w") + f.write("root:x:0:root\n") + f.write("nobody:x:99:\n") f.close()

def _setupDns(self):

hooks/post-receive -- IPFire 3.x development tree