particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into rpm-ostree-local-repo-rpm

Browse source
This commit is contained in:
fiftydinar 2024-08-01 17:37:50 +02:00 • committed by GitHub
commit 5e174e337b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/bling/installers/ublue-update.sh
View file

@ -29,7 +29,7 @@ systemctl disable rpm-ostreed-automatic.timer
# Fetch ublue COPR
REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}"
# topgrade is REQUIRED by ublue-update to install
rpm-ostree install topgrade

8
modules/yafti/yafti.sh
View file

@ -20,11 +20,15 @@ FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
# Fetch ublue COPR
REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}"
# Increase repo priority, since downstream Ublue images like Bluefin/Aurora & Bazzite can explicitly disable this repo in another .repo file
echo "priority=90" >> "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo"
# Install yafti RPM to fixed version, since refactored yafti should come after this version
# We don't want to surprise users with that
rpm-ostree install yafti-0.8.0
# Remove ublue COPR
rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo
# Remove ublue-staging COPR
rm "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo"
# If the profile.d directory doesn't exist, create it
if [ ! -d "${PROFILED_DIR}" ]; then