[PATCH] Fix branched compose configs.

[Bill Nottingham]

commit 6b69d798057ff8592bec1c3e3962f65d9207afe8
Author: Bill Nottingham <notting(a)puppet01.phx2.fedoraproject.org&gt;
Date:   Tue Aug 3 17:51:36 2010 +0000

    Fix branched compose configs.

diff --git a/modules/mock/files/mock/fedora-branched-compose-i386.cfg
b/modules/mock/files/mock/fedora-branched-compose-i386.cfg
index 85581ef..d4f0ced 100644
--- a/modules/mock/files/mock/fedora-branched-compose-i386.cfg
+++ b/modules/mock/files/mock/fedora-branched-compose-i386.cfg
@@ -1,10 +1,14 @@
 config_opts['root'] = 'fedora-branched-compose-i386'
 config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced joe
pungi'
 config_opts['dist'] = 'fc14'  # only useful for --resultdir variable
subst
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji',
'/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora',
'/pub/fedora' ))
 config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi',
'/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev',
'/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts',
'/dev/pts' ))
+
+
 
 config_opts['yum.conf'] = """
 [main]
diff --git a/modules/mock/files/mock/fedora-branched-compose-x86_64.cfg
b/modules/mock/files/mock/fedora-branched-compose-x86_64.cfg
new file mode 100644
index 0000000..201f18e
--- /dev/null
+++ b/modules/mock/files/mock/fedora-branched-compose-x86_64.cfg
@@ -0,0 +1,40 @@
+config_opts['root'] = 'fedora-branched-compose-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced joe
pungi'
+config_opts['dist'] = 'fc14'  # only useful for --resultdir variable
subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi',
'/srv/pungi' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev',
'/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts',
'/dev/pts' ))
+
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f14-build/latest/x86_64
+enabled=1
+#cost=2000
+"""
+
+
+