From 2d5981d673c3aa023dda91288ad30fd7fca74dff Mon Sep 17 00:00:00 2001 From: Ian Wienand <iwienand@redhat.com> Date: Thu, 14 Oct 2021 11:28:34 +1100 Subject: [PATCH] epel: match replacement better It looks like upstream have changed this line to "download.example", breaking our subsitution. Let's do a generic match. Change-Id: I8e443022a5f239b98ccefe73a9abf8cf259dc8e9 --- .../elements/epel/pre-install.d/05-rpm-epel-release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release index 91c166240..5810e4ede 100755 --- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release +++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release @@ -48,5 +48,5 @@ DIB_EPEL_MIRROR=${DIB_EPEL_MIRROR:-} [ -n "$DIB_EPEL_MIRROR" ] || exit 0 # Set the EPEL mirror to use -sed -e "s|^#baseurl=http[s]*://download.fedoraproject.org/pub/epel|baseurl=$DIB_EPEL_MIRROR|;/^mirrorlist=/d;/^metalink=/d" -i /etc/yum.repos.d/epel.repo +sed -e "s|^#baseurl=http[s]*://.*/pub/epel|baseurl=$DIB_EPEL_MIRROR|;/^mirrorlist=/d;/^metalink=/d" -i /etc/yum.repos.d/epel.repo