mock/etc fedora-3-i386-core.cfg, 1.1.1.1, 1.2 fedora-3-x86_64-core.cfg, 1.1.1.1, 1.2 fedora-development-i386-core.cfg, 1.1.1.1, 1.2 fedora-development-ppc-core.cfg, 1.1.1.1, 1.2 fedora-development-x86_64-core.cfg, 1.1.1.1, 1.2

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2650/etc

Modified Files:
	fedora-3-i386-core.cfg fedora-3-x86_64-core.cfg 
	fedora-development-i386-core.cfg 
	fedora-development-ppc-core.cfg 
	fedora-development-x86_64-core.cfg 
Log Message:

- allow users other than uid=500,gid=500
- fix warnings in mock-helper
- fix umount of proc and devpts



Index: fedora-3-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-i386-core.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-3-i386-core.cfg	16 May 2005 02:44:01 -0000	1.1.1.1
+++ fedora-3-i386-core.cfg	19 May 2005 14:24:40 -0000	1.2
@@ -1,5 +1,5 @@
 #!/usr/bin/python -tt
-
+import os
 config_opts['root'] = 'fedora-3-i386-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
@@ -12,8 +12,8 @@
 config_opts['buildgroup'] = 'build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = 500
-config_opts['chrootgid'] = 500
+config_opts['chrootuid'] = os.geteuid()
+config_opts['chrootgid'] = os.getegid()
 config_opts['chroothome'] = '/builddir'
 config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'


Index: fedora-3-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-x86_64-core.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-3-x86_64-core.cfg	16 May 2005 02:44:01 -0000	1.1.1.1
+++ fedora-3-x86_64-core.cfg	19 May 2005 14:24:40 -0000	1.2
@@ -1,5 +1,5 @@
 #!/usr/bin/python -tt
-
+import os
 config_opts['root'] = 'fedora-3-x86_64-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
@@ -12,8 +12,8 @@
 config_opts['buildgroup'] = 'build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = 500
-config_opts['chrootgid'] = 500
+config_opts['chrootuid'] = os.geteuid()
+config_opts['chrootgid'] = os.getegid()
 config_opts['chroothome'] = '/builddir'
 config_opts['clean'] = True
 config_opts['target_arch'] = 'x86_64'


Index: fedora-development-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-development-i386-core.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-development-i386-core.cfg	16 May 2005 02:44:01 -0000	1.1.1.1
+++ fedora-development-i386-core.cfg	19 May 2005 14:24:40 -0000	1.2
@@ -1,5 +1,6 @@
 #!/usr/bin/python -tt
 
+import os
 config_opts['root'] = 'fedora-development-i386-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
@@ -12,8 +13,8 @@
 config_opts['buildgroup'] = 'build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = 500
-config_opts['chrootgid'] = 500
+config_opts['chrootuid'] = os.geteuid()
+config_opts['chrootgid'] = os.getegid()
 config_opts['chroothome'] = '/builddir'
 config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'


Index: fedora-development-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-development-ppc-core.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-development-ppc-core.cfg	16 May 2005 02:44:01 -0000	1.1.1.1
+++ fedora-development-ppc-core.cfg	19 May 2005 14:24:40 -0000	1.2
@@ -1,5 +1,5 @@
 #!/usr/bin/python -tt
-
+import os
 config_opts['root'] = 'fedora-development-ppc-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
@@ -12,8 +12,8 @@
 config_opts['buildgroup'] = 'build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = 500
-config_opts['chrootgid'] = 500
+config_opts['chrootuid'] = os.geteuid()
+config_opts['chrootgid'] = os.getegid()
 config_opts['chroothome'] = '/builddir'
 config_opts['clean'] = True
 config_opts['target_arch'] = 'ppc'


Index: fedora-development-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-development-x86_64-core.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-development-x86_64-core.cfg	16 May 2005 02:44:01 -0000	1.1.1.1
+++ fedora-development-x86_64-core.cfg	19 May 2005 14:24:40 -0000	1.2
@@ -1,4 +1,5 @@
 #!/usr/bin/python -tt
+import os
 
 config_opts['root'] = 'fedora-development-x86_64-core'
 config_opts['basedir'] = '/var/lib/mock/'
@@ -12,8 +13,8 @@
 config_opts['buildgroup'] = 'build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = 500
-config_opts['chrootgid'] = 500
+config_opts['chrootuid'] = os.geteuid()
+config_opts['chrootgid'] = os.getegid()
 config_opts['chroothome'] = '/builddir'
 config_opts['clean'] = True
 config_opts['target_arch'] = 'x86_64'