From ff554be74923a0b4835eab8acc4a47bd3e86756c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 17 Jul 2023 11:01:31 +0200 Subject: [PATCH] disable use_bootstrap_image for mageia chroots the images are reported to be broken and does not work with Mock (or at all) When the state change (and somebody will test it) we can enable it to use this feature. --- mock-core-configs/etc/mock/templates/mageia-7.tpl | 1 + mock-core-configs/etc/mock/templates/mageia-branched.tpl | 1 + mock-core-configs/etc/mock/templates/mageia-cauldron.tpl | 1 + 3 files changed, 3 insertions(+) diff --git a/mock-core-configs/etc/mock/templates/mageia-7.tpl b/mock-core-configs/etc/mock/templates/mageia-7.tpl index 3a4d6f956..4a1fb2d38 100644 --- a/mock-core-configs/etc/mock/templates/mageia-7.tpl +++ b/mock-core-configs/etc/mock/templates/mageia-7.tpl @@ -5,6 +5,7 @@ config_opts['releasever'] = '7' config_opts['macros']['%distro_section'] = 'core' config_opts['package_manager'] = 'dnf' config_opts['bootstrap_image'] = 'docker.io/library/mageia:7' +config_opts['use_bootstrap_image'] = False config_opts['description'] = 'Mageia 7' config_opts['dnf.conf'] = """ diff --git a/mock-core-configs/etc/mock/templates/mageia-branched.tpl b/mock-core-configs/etc/mock/templates/mageia-branched.tpl index cde97c65d..280fb73b3 100644 --- a/mock-core-configs/etc/mock/templates/mageia-branched.tpl +++ b/mock-core-configs/etc/mock/templates/mageia-branched.tpl @@ -5,6 +5,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['macros']['%distro_section'] = 'core' config_opts['package_manager'] = 'dnf' config_opts['bootstrap_image'] = 'docker.io/library/mageia:{{ releasever }}' +config_opts['use_bootstrap_image'] = False config_opts['description'] = 'Mageia {{ releasever }}' config_opts['dnf.conf'] = """ diff --git a/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl b/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl index 0745aa6ce..bddaa04f7 100644 --- a/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl +++ b/mock-core-configs/etc/mock/templates/mageia-cauldron.tpl @@ -6,6 +6,7 @@ config_opts['releasever'] = '9' config_opts['macros']['%distro_section'] = 'core' config_opts['package_manager'] = 'dnf' config_opts['bootstrap_image'] = 'docker.io/library/mageia:cauldron' +config_opts['use_bootstrap_image'] = False config_opts['description'] = 'Mageia Cauldron' config_opts['dnf.conf'] = """