18 files changed, 11 insertions, 554 deletions
diff --git a/etc/mock/epel-6-i386.cfg b/etc/mock/epel-6-i386.cfg
index 8930b77..bbaad35 100644
--- a/etc/mock/epel-6-i386.cfg
+++ b/etc/mock/epel-6-i386.cfg
@@ -19,11 +19,11 @@ syslog_device=
 # repos
 [beta]
 name=beta
-baseurl=ftp://ftp.redhat.com/redhat/rhel/beta/6/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rhel-5.90Server-beta&arch=i386
 
 [beta-optional]
 name=optional
-baseurl=ftp://ftp.redhat.com/redhat/rhel/beta/6/optional/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rhel-optional-5.90Server-beta&arch=i386
 
 [base]
 name=BaseOS
diff --git a/etc/mock/epel-6-ppc64.cfg b/etc/mock/epel-6-ppc64.cfg
index 39e83f2..adbfc7d 100644
--- a/etc/mock/epel-6-ppc64.cfg
+++ b/etc/mock/epel-6-ppc64.cfg
@@ -19,11 +19,11 @@ syslog_device=
 # repos
 [beta]
 name=beta
-baseurl=ftp://ftp.redhat.com/redhat/rhel/beta/6/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rhel-5.90Server-beta&arch=ppc64
 
 [beta-optional]
 name=optional
-baseurl=ftp://ftp.redhat.com/redhat/rhel/beta/6/optional/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rhel-optional-5.90Server-beta&arch=ppc64
 
 [base]
 name=BaseOS
diff --git a/etc/mock/epel-6-x86_64.cfg b/etc/mock/epel-6-x86_64.cfg
index d1ca03b..d00dbb6 100644
--- a/etc/mock/epel-6-x86_64.cfg
+++ b/etc/mock/epel-6-x86_64.cfg
@@ -19,11 +19,11 @@ syslog_device=
 # repos
 [beta]
 name=beta
-baseurl=ftp://ftp.redhat.com/redhat/rhel/beta/6/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rhel-5.90Server-beta&arch=x86_64
 
 [beta-optional]
 name=optional
-baseurl=ftp://ftp.redhat.com/redhat/rhel/beta/6/optional/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rhel-optional-5.90Server-beta&arch=x86_64
 
 [base]
 name=BaseOS
diff --git a/etc/mock/fedora-10-i386.cfg b/etc/mock/fedora-10-i386.cfg
deleted file mode 100644
index 0d41c47..0000000
--- a/etc/mock/fedora-10-i386.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-config_opts['root'] = 'fedora-10-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=i386
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=i386
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f10-build/latest/i386/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-10-ppc.cfg b/etc/mock/fedora-10-ppc.cfg
deleted file mode 100644
index 3c39e38..0000000
--- a/etc/mock/fedora-10-ppc.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-config_opts['root'] = 'fedora-10-ppc'
-config_opts['target_arch'] = 'ppc'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-#exclude=*.ppc64
-# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=ppc
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=ppc
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f10-build/latest/ppc/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-10-ppc64.cfg b/etc/mock/fedora-10-ppc64.cfg
deleted file mode 100644
index 078d79c..0000000
--- a/etc/mock/fedora-10-ppc64.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-config_opts['root'] = 'fedora-10-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=ppc64
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=ppc64
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f10-build/latest/ppc64/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-10-s390x.cfg b/etc/mock/fedora-10-s390x.cfg
deleted file mode 100644
index f9017eb..0000000
--- a/etc/mock/fedora-10-s390x.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-config_opts['root'] = 'fedora-10-s390x'
-config_opts['target_arch'] = 's390x'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=s390x
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=s390x
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://s390.koji.fedoraproject.org/repos/dist-f10-build/latest/s390x/
-cost=2000
-enabled=0
-"""
diff --git a/etc/mock/fedora-10-sparc.cfg b/etc/mock/fedora-10-sparc.cfg
deleted file mode 100644
index b091338..0000000
--- a/etc/mock/fedora-10-sparc.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-10-sparc'
-config_opts['target_arch'] = 'sparcv9'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-#exclude=*.sparc64
-# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=sparc
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=sparc
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://sparc.koji.fedoraproject.org/repos/dist-f10-build/latest/sparc/
-cost=2000
-enabled=0
-"""
diff --git a/etc/mock/fedora-10-sparc64.cfg b/etc/mock/fedora-10-sparc64.cfg
deleted file mode 100644
index 1b7df2d..0000000
--- a/etc/mock/fedora-10-sparc64.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-config_opts['root'] = 'fedora-10-sparc64'
-config_opts['target_arch'] = 'sparc64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=sparc64
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=sparc64
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://sparc.koji.fedoraproject.org/repos/dist-f10-build/latest/sparc64/
-cost=2000
-enabled=0
-"""
diff --git a/etc/mock/fedora-10-x86_64.cfg b/etc/mock/fedora-10-x86_64.cfg
deleted file mode 100644
index 6b8ac49..0000000
--- a/etc/mock/fedora-10-x86_64.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-config_opts['root'] = 'fedora-10-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc10'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
-# .i?86 packages except these.
-#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
-# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=x86_64
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=x86_64
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f10-build/latest/x86_64/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-11-i386.cfg b/etc/mock/fedora-11-i386.cfg
deleted file mode 100644
index 0e6223d..0000000
--- a/etc/mock/fedora-11-i386.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-config_opts['root'] = 'fedora-11-i386'
-config_opts['target_arch'] = 'i586'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=i386
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=i386
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f11-build/latest/i386/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-11-ppc.cfg b/etc/mock/fedora-11-ppc.cfg
deleted file mode 100644
index d5c8727..0000000
--- a/etc/mock/fedora-11-ppc.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-config_opts['root'] = 'fedora-11-ppc'
-config_opts['target_arch'] = 'ppc'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-#exclude=*.ppc64
-# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=ppc
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=ppc
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f11-build/latest/ppc/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-11-ppc64.cfg b/etc/mock/fedora-11-ppc64.cfg
deleted file mode 100644
index e7f4c8a..0000000
--- a/etc/mock/fedora-11-ppc64.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-config_opts['root'] = 'fedora-11-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=ppc64
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=ppc64
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f11-build/latest/ppc64/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/fedora-11-s390x.cfg b/etc/mock/fedora-11-s390x.cfg
deleted file mode 100644
index d37fee0..0000000
--- a/etc/mock/fedora-11-s390x.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-config_opts['root'] = 'fedora-11-s390x'
-config_opts['target_arch'] = 's390x'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=s390x
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=s390x
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://s390.koji.fedoraproject.org/repos/dist-f11-build/latest/s390x/
-cost=2000
-enabled=0
-"""
diff --git a/etc/mock/fedora-11-sparc.cfg b/etc/mock/fedora-11-sparc.cfg
deleted file mode 100644
index e8d6839..0000000
--- a/etc/mock/fedora-11-sparc.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-11-sparc'
-config_opts['target_arch'] = 'sparcv9'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-#exclude=*.sparc64
-# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=sparc
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=sparc
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://sparc.koji.fedoraproject.org/repos/dist-f11-build/latest/sparc/
-cost=2000
-enabled=0
-"""
diff --git a/etc/mock/fedora-11-sparc64.cfg b/etc/mock/fedora-11-sparc64.cfg
deleted file mode 100644
index 71e2d1e..0000000
--- a/etc/mock/fedora-11-sparc64.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-config_opts['root'] = 'fedora-11-sparc64'
-config_opts['target_arch'] = 'sparc64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=sparc64
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=sparc64
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://sparc.koji.fedoraproject.org/repos/dist-f11-build/latest/sparc64/
-cost=2000
-enabled=0
-"""
diff --git a/etc/mock/fedora-11-x86_64.cfg b/etc/mock/fedora-11-x86_64.cfg
deleted file mode 100644
index c239539..0000000
--- a/etc/mock/fedora-11-x86_64.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-config_opts['root'] = 'fedora-11-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc11'  # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
-# .i?86 packages except these.
-#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
-# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
-
-# repos
-
-[fedora]
-name=fedora
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=x86_64
-failovermethod=priority
-
-[updates-released]
-name=updates
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=x86_64
-failovermethod=priority
-
-[local]
-name=local
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f11-build/latest/x86_64/
-cost=2000
-enabled=0
-"""
-
-
-
diff --git a/etc/mock/site-defaults.cfg b/etc/mock/site-defaults.cfg
index 83d2ea7..6dc4d33 100644
--- a/etc/mock/site-defaults.cfg
+++ b/etc/mock/site-defaults.cfg
@@ -5,7 +5,7 @@
 # configurations. Options specified in this config file can be overridden in
 # the individual mock config files.
 #
-# The defaults.cfg delivered by default has NO options set. Only set options
+# The site-defaults.cfg delivered by default has NO options set. Only set options
 # here if you want to override the defaults.
 #
 # Entries in this file follow the same format as other mock config files.
@@ -13,7 +13,7 @@
 
 #############################################################################
 #
-# Things that we recommend you set in defaults.cfg:
+# Things that we recommend you set in site-defaults.cfg:
 #
 # config_opts['basedir'] = '/var/lib/mock/'
 # config_opts['cache_topdir'] = '/var/cache/mock'
@@ -53,7 +53,7 @@
 #############################################################################
 #
 # plugin related. Below are the defaults. Change to suit your site
-# policy. defaults.cfg is a good place to do this.
+# policy. site-defaults.cfg is a good place to do this.
 #
 # NOTE: Some of the caching options can theoretically affect build
 #  reproducability. Change with care.
@@ -75,7 +75,8 @@
 # config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/host/path', '/bind/mount/path/in/chroot/' ))
 #
 # config_opts['plugin_conf']['tmpfs_enable'] = False
-# config_opts['plugin_conf']['tmpfs_opts'] = {'required_ram_mb': 1024}
+# config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
+# config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '512m'
 
 #############################################################################
 #