From 550845cd6cf8c25da1087583fa0f8ca0f6ec93a1 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus <915544+detiber@users.noreply.github.com> Date: Mon, 16 Dec 2024 05:25:50 -0500 Subject: [PATCH] fix os-release for bluefin-dx build --- .../bluefin/build_files/{base => shared}/00-image-info.sh | 0 variants/bluefin/build_files/shared/build-base.sh | 2 +- variants/bluefin/build_files/shared/build-dx.sh | 7 ++----- 3 files changed, 3 insertions(+), 6 deletions(-) rename variants/bluefin/build_files/{base => shared}/00-image-info.sh (100%) diff --git a/variants/bluefin/build_files/base/00-image-info.sh b/variants/bluefin/build_files/shared/00-image-info.sh similarity index 100% rename from variants/bluefin/build_files/base/00-image-info.sh rename to variants/bluefin/build_files/shared/00-image-info.sh diff --git a/variants/bluefin/build_files/shared/build-base.sh b/variants/bluefin/build_files/shared/build-base.sh index 458ef71..d65e9ed 100755 --- a/variants/bluefin/build_files/shared/build-base.sh +++ b/variants/bluefin/build_files/shared/build-base.sh @@ -30,7 +30,7 @@ rsync -rvK /ctx/system_files/shared/ / rsync -rvK /ctx/system_files/"${BASE_IMAGE_NAME}"/ / # Generate image-info.json -/ctx/build_files/base/00-image-info.sh +/ctx/build_files/shared/00-image-info.sh # # Build Fix - Fix known skew offenders # /ctx/build_files/base/01-build-fix.sh diff --git a/variants/bluefin/build_files/shared/build-dx.sh b/variants/bluefin/build_files/shared/build-dx.sh index 7eda0a4..49c21b9 100755 --- a/variants/bluefin/build_files/shared/build-dx.sh +++ b/variants/bluefin/build_files/shared/build-dx.sh @@ -12,8 +12,8 @@ rsync -rvK /ctx/system_files/dx/ / # Apply IP Forwarding before installing Docker to prevent messing with LXC networking sysctl -p -# Generate image-info.json (Not Needed?) -# /ctx/build_files/shared/image-info.sh +# Generate image-info.json +/ctx/build_files/shared/00-image-info.sh # # COPR Repos # /ctx/build_files/dx/01-install-copr-repos-dx.sh @@ -27,9 +27,6 @@ sysctl -p # # Fetch Install # /ctx/build_files/dx/04-override-install-dx.sh -# Branding Changes -sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release - # # Systemd and Disable Repos # /ctx/build_files/dx/09-cleanup-dx.sh