From 1b9c0982175906941bbb8253dbcfa95b29a88905 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 26 2024 09:32:47 +0000
Subject: [PATCH 1/2] Revert "Bootable Containers: Enable composefs by default"


See: https://gitlab.com/fedora/ostree/sig/-/issues/35

This reverts commit 20d815873585502c920ad421dd70229967c8400b.

---

diff --git a/common.yaml b/common.yaml
index cfbe047..b16245b 100644
--- a/common.yaml
+++ b/common.yaml
@@ -32,7 +32,6 @@ conditional-include:
   # Manifests included only for the Bootable Container variants
   - if: bootable_container == true
     include:
-      - composefs.yaml
       - bootc.yaml
       - dnf5.yaml
 
diff --git a/composefs.yaml b/composefs.yaml
deleted file mode 100644
index f2e3e0d..0000000
--- a/composefs.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set up composefs by default
-# See: https://fedoraproject.org/wiki/Changes/ComposefsAtomicCoreOSIoT
-postprocess:
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-
-    cat >> /usr/lib/ostree/prepare-root.conf << 'EOF'
-    [composefs]
-    enabled = yes
-    EOF

From f209ed76cd617a152f5d59d8ec58bf11bfeb52ee Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 26 2024 09:32:55 +0000
Subject: [PATCH 2/2] Revert "Bootable Containers: Remove ostree-grub2"


See: https://gitlab.com/fedora/ostree/sig/-/issues/35

This reverts commit 599c862ece2547751cc940db2f1cb6c40114e0d8.

---

diff --git a/common-packages.yaml b/common-packages.yaml
index b5a32ff..ae6f5d4 100644
--- a/common-packages.yaml
+++ b/common-packages.yaml
@@ -124,6 +124,7 @@ packages:
   - openssh-clients
   - openssh-server
   - orca
+  - ostree-grub2
   - pam_afs_session
   - paps
   - passwdqc
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index f7df003..ce676ba 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -106,9 +106,6 @@ exclude_list:
     - cups-pk-helper
     # For now...
     - ghostscript
-  workstation-ostree-support:
-    # Now only included in the legacy ostree variants
-    - ostree-grub2
 
 # Desktop environment specific exclude lists
 desktop_exclude_list:
diff --git a/ostree-classic.yaml b/ostree-classic.yaml
index a331b17..b0de205 100644
--- a/ostree-classic.yaml
+++ b/ostree-classic.yaml
@@ -1,10 +1,5 @@
 # Manifest for classic ostree varaints only and not Bootable Containers
 
-# Packages only included in the legacy ostree variants and not in Bootable
-# Containers
-packages:
-  - ostree-grub2
-
 # We do not include any version of DNF in the classic ostree Atomic Desktops
 # See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora
 exclude-packages: