Merge branch 'main' into switch-channels

just/bluefin-system.just

@@ -291,13 +291,6 @@ alias rollback-helper := rebase-helper
 rebase-helper:
     @/usr/bin/ublue-rollback-helper
 
-[group('System')]
-update-ng:
-    echo "Note: This command doesn't work if you have locally layered packages"
-    sudo bootc upgrade
-    flatpak update -y
-    brew upgrade
-
 # Toggle tailscale
 [group('System')]
 toggle-tailscale:

system_files/shared/usr/bin/ublue-rollback-helper

@@ -44,11 +44,16 @@ function rebase_helper(){
     fi
     echo "Rebase Target is ${rebase_target}"
     echo "Confirm Rebase"
-    if [[ $(Confirm) -eq "0" ]]; then
-        rpm-ostree rebase ostree-image-signed:docker://"${rebase_target}"
-    else
+    if [[ $(Confirm) -ne "0" ]]; then
         return 1
     fi
+
+    if /usr/bin/grep "^LockLayering=true" /etc/rpm-ostreed.conf &> /dev/null; then
+        pkexec bootc switch --enforce-container-sigpolicy "${rebase_target}"
+        return 0
+    fi
+    rpm-ostree rebase ostree-image-signed:docker://"${rebase_target}"
+    return 0
 }
 
 echo "Choose your action."

system_files/shared/usr/share/ublue-os/just/10-update.just

@@ -5,7 +5,9 @@ alias upgrade := update
 # Update system, flatpaks, and containers all at once
 update:
     #!/usr/bin/bash
-    /usr/bin/topgrade --config /usr/share/ublue-os/topgrade.toml --keep
+    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
 
 alias auto-update := toggle-updates
 

system_files/shared/usr/share/ublue-os/topgrade-bootc.toml

@@ -0,0 +1,9 @@
+[misc]
+no_self_update = true
+disable = ["self_update", "toolbx", "containers", "helm", "system"]
+ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "node", "pip3", "home_manager", "firmware"]
+assume_yes = true
+no_retry = false
+
+[commands]
+"System Upgrade" = "sudo bootc upgrade"