Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove ublue-update and rely on units to get auto updates instead #2181

Merged
merged 4 commits into from
Feb 5, 2025
Merged

fix: remove ublue-update and rely on units to get auto updates instead #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e58991b
fix: remove ublue-update and rely on units to get auto updates instead
tulilirockz Feb 4, 2025
804483f
fix: dont remove ublue-os-update-services and enable units
tulilirockz Feb 4, 2025
72bd76f
fix: brew update units arent necessary + typo in packages.json
tulilirockz Feb 4, 2025
b233121
fix: brew units are necessary for brew autoupdate
tulilirockz Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions build_files/base/05-override-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ install -c -m 0755 /tmp/starship /usr/bin
# shellcheck disable=SC2016
echo 'eval "$(starship init bash)"' >> /etc/bashrc

# Install ublue-update -- breaks with packages.json due to missing topgrade
dnf5 -y install ublue-update

# Required for bluefin faces to work without conflicting with a ton of packages
rm -f /usr/share/pixmaps/faces/* || echo "Expected directory deletion to fail"
mv /usr/share/pixmaps/faces/bluefin/* /usr/share/pixmaps/faces
Expand All @@ -53,9 +50,6 @@ dnf5 -y swap fedora-logos bluefin-logos
# Consolidate Just Files
find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just

# Move over ublue-update config
mv -f /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml

# Register Fonts
fc-cache -f /usr/share/fonts/ubuntu
fc-cache -f /usr/share/fonts/inter
Expand Down
4 changes: 3 additions & 1 deletion build_files/base/17-cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ systemctl enable rpm-ostree-countme.service
systemctl enable tailscaled.service
systemctl enable dconf-update.service
systemctl --global enable ublue-flatpak-manager.service
systemctl enable ublue-update.timer
systemctl enable rpm-ostreed-automatic.timer
systemctl enable flatpak-system-update.timer
systemctl --global enable flatpak-user-update.timer
systemctl enable ublue-system-setup.service
systemctl enable ublue-guest-user.service
systemctl enable brew-setup.service
Expand Down
1 change: 0 additions & 1 deletion build_files/shared/build-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ mkdir -p /var/lib/alternatives
# Copy Files to Container
cp -r /ctx/just /tmp/just
cp /ctx/packages.json /tmp/packages.json
cp /ctx/system_files/shared/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml
rsync -rvK /ctx/system_files/shared/ /
rsync -rvK /ctx/system_files/"${BASE_IMAGE_NAME}"/ /
echo "::endgroup::"
Expand Down
3 changes: 1 addition & 2 deletions packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@
"all": [
"firefox-langpacks",
"firefox",
"podman-docker",
"ublue-os-update-services"
"podman-docker"
],
"silverblue": [
"gnome-extensions-app",
Expand Down
12 changes: 6 additions & 6 deletions system_files/shared/usr/share/ublue-os/just/10-update.just
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ alias upgrade := update
# Update system, flatpaks, and containers all at once
update:
#!/usr/bin/bash
TOPGRADE_CONFIG="/usr/share/ublue-os/topgrade"
/usr/bin/grep "^LockLayering=true" /etc/rpm-ostreed.conf &>/dev/null && TOPGRADE_CONFIG="${TOPGRADE_CONFIG}-bootc"
/usr/bin/topgrade --config "${TOPGRADE_CONFIG}.toml" --keep
rpm-ostree upgrade
flatpak update -y
brew update

alias auto-update := toggle-updates

Expand All @@ -16,7 +16,7 @@ toggle-updates ACTION="prompt":
#!/usr/bin/bash
source /usr/lib/ujust/ujust.sh
CURRENT_STATE="Disabled"
if systemctl is-enabled ublue-update.timer | grep -q enabled; then
if systemctl is-enabled rpm-ostreed-automatic.timer | grep -q enabled; then
CURRENT_STATE="Enabled"
fi
OPTION={{ ACTION }}
Expand All @@ -32,9 +32,9 @@ toggle-updates ACTION="prompt":
exit 0
fi
if [ "${OPTION,,}" == "enable" ]; then
sudo systemctl enable ublue-update.timer
sudo systemctl enable rpm-ostreed-automatic.timer
elif [ "${OPTION,,}" == "disable" ]; then
sudo systemctl disable ublue-update.timer
sudo systemctl disable rpm-ostreed-automatic.timer
fi

alias changelog := changelogs
Expand Down