From c4c21967d8c25a0ae868ee9f18cb5a8c9c8dbfb5 Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Mon, 25 Jan 2021 09:54:22 +0300
Subject: [PATCH] Fix hooks order for CentOS/Fedora when mirror used
The python3/python3-pyyaml packages both are never installed and dnf
itself never updated when $DIB_DISTRIBUTION_MIRROR set and used.
This change fix the order of the operations:
1. yum/dnf configure.
2. *.repo patching.
3. yum/dnf update/install execution.
Change-Id: Ifbbf1f0190fe8c8a77fb3be820e8056447e755f6
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
.../{01-set-centos-mirror => 00-02-set-centos-mirror} | 0
.../{01-set-fedora-mirror => 00-02-set-fedora-mirror} | 0
.../yum/pre-install.d/{01-yum-keepcache => 00-01-yum-keepcache} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename diskimage_builder/elements/centos/pre-install.d/{01-set-centos-mirror => 00-02-set-centos-mirror} (100%)
rename diskimage_builder/elements/fedora/pre-install.d/{01-set-fedora-mirror => 00-02-set-fedora-mirror} (100%)
rename diskimage_builder/elements/yum/pre-install.d/{01-yum-keepcache => 00-01-yum-keepcache} (100%)
diff --git a/diskimage_builder/elements/centos/pre-install.d/01-set-centos-mirror b/diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror
similarity index 100%
rename from diskimage_builder/elements/centos/pre-install.d/01-set-centos-mirror
rename to diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror
diff --git a/diskimage_builder/elements/fedora/pre-install.d/01-set-fedora-mirror b/diskimage_builder/elements/fedora/pre-install.d/00-02-set-fedora-mirror
similarity index 100%
rename from diskimage_builder/elements/fedora/pre-install.d/01-set-fedora-mirror
rename to diskimage_builder/elements/fedora/pre-install.d/00-02-set-fedora-mirror
diff --git a/diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache b/diskimage_builder/elements/yum/pre-install.d/00-01-yum-keepcache
similarity index 100%
rename from diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache
rename to diskimage_builder/elements/yum/pre-install.d/00-01-yum-keepcache