upgrade works...

Author: jmarrero

crates/lib/src/deploy.rs

@@ -327,6 +327,16 @@ pub(crate) async fn prune_container_store(sysroot: &Storage) -> Result<()> {
     for deployment in deployments {
         let bound = crate::boundimage::query_bound_images_for_deployment(ostree, &deployment)?;
         all_bound_images.extend(bound.into_iter());
+        // Also include the host image itself
+        if let Some(host_image) = crate::status::boot_entry_from_deployment(ostree, &deployment)?
+            .image
+            .map(|i| i.image)
+        {
+            all_bound_images.push(crate::boundimage::BoundImage {
+                image: crate::utils::imageref_to_container_ref(&host_image),
+                auth_file: None,
+            });
+        }
     }
     // Convert to a hashset of just the image names
     let image_names = HashSet::from_iter(all_bound_images.iter().map(|img| img.image.as_str()));

crates/lib/src/podstorage.rs

@@ -311,7 +311,7 @@ impl CStorage {
                 .names
                 .iter()
                 .flatten()
-                .any(|name| !roots.contains(name.as_str()))
+                .all(|name| !roots.contains(name.as_str()))
             {
                 garbage.push(image.id);
             }

crates/lib/src/status.rs

@@ -186,7 +186,7 @@ fn imagestatus(
 
 /// Given an OSTree deployment, parse out metadata into our spec.
 #[context("Reading deployment metadata")]
-fn boot_entry_from_deployment(
+pub(crate) fn boot_entry_from_deployment(
     sysroot: &SysrootLock,
     deployment: &ostree::Deployment,
 ) -> Result<BootEntry> {