From 85d455791c32f04d00408dcd88242e5abaa26894 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 15 Oct 2021 15:05:24 +0100 Subject: [PATCH] osbuilder: update base rootfs to be ubuntu - Revert fedora OS changes made in #2556 as we aren't using it anymore. - They should be done in main under #2116 Fixes #2849 Signed-off-by: stevenhorsman --- tools/osbuilder/rootfs-builder/fedora/Dockerfile.in | 2 +- tools/osbuilder/rootfs-builder/fedora/config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in b/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in index 3cacbe9258..dac32f5050 100644 --- a/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in +++ b/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in @@ -30,7 +30,7 @@ RUN dnf -y update && dnf install -y \ m4 \ make \ pkgconfig \ - fedora-release-common \ + redhat-release \ sed \ systemd \ tar \ diff --git a/tools/osbuilder/rootfs-builder/fedora/config.sh b/tools/osbuilder/rootfs-builder/fedora/config.sh index 60a38fed41..3e5e9a13f3 100644 --- a/tools/osbuilder/rootfs-builder/fedora/config.sh +++ b/tools/osbuilder/rootfs-builder/fedora/config.sh @@ -5,7 +5,7 @@ OS_NAME="Fedora" -OS_VERSION=${OS_VERSION:-34} +OS_VERSION=${OS_VERSION:-30} MIRROR_LIST="https://mirrors.fedoraproject.org/metalink?repo=fedora-${OS_VERSION}&arch=\$basearch"