Merge pull request #282 from ublue-os/main

[pull] main from ublue-os:main
wizzywizard65 · Feb 4, 2025 · f83a034 · f83a034
2 parents 3373ff0 + c2ff376
commit f83a034
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/build_files/base/05-override-install.sh b/build_files/base/05-override-install.sh
@@ -35,9 +35,6 @@ install -c -m 0755 /tmp/starship /usr/bin
 # shellcheck disable=SC2016
 echo 'eval "$(starship init bash)"' >> /etc/bashrc
 
-# Topgrade Install
-pip install --prefix=/usr topgrade
-
 # Install ublue-update -- breaks with packages.json due to missing topgrade
 dnf5 -y install ublue-update
 

diff --git a/packages.json b/packages.json
@@ -60,6 +60,7 @@
 				"stress-ng",
 				"tailscale",
 				"tmux",
+				"topgrade",
 				"ublue-fastfetch",
 				"ublue-motd",
 				"usbmuxd",

diff --git a/system_files/shared/usr/share/ublue-os/topgrade.toml b/system_files/shared/usr/share/ublue-os/topgrade.toml
@@ -7,4 +7,5 @@ assume_yes = true
 no_retry = false
 
 [linux]
+bootc = false
 rpm_ostree = true