CI: initial hardcoded ci

images/base/manifest.yaml

@@ -38,6 +38,3 @@ packages:
 repos:
    - fedora-base
    - fedora-updates
-
-labels:
-  containers.bootc: "1"

images/shared/base.yaml

@@ -150,10 +150,7 @@ postprocess:
   - |
     #!/bin/bash
     set -xeuo pipefail
-    source /usr/lib/os-release
-    if [ $ID == "fedora" ] && [ ${VERSION_ID} -ge 43 ]; then
-      echo "enable bootloader-update.service" >> /usr/lib/systemd/system-preset/85-bootc.preset
-    fi
+    echo "enable bootloader-update.service" >> /usr/lib/systemd/system-preset/85-bootc.preset
   # Undo RPM scripts enabling units; we want the presets to be canonical
   # https://github.com/projectatomic/rpm-ostree/issues/1803
   - |
@@ -179,6 +176,21 @@ packages:
  - xfsprogs e2fsprogs dosfstools
  - bootupd
 
+packages-x86_64:
+ - grub2 grub2-efi-x64 efibootmgr shim
+ - microcode_ctl
+
 exclude-packages:
  - kernel-debug-core
 
+ # The grub bits are mainly designed for desktops, and IMO haven't seen
+  # enough testing in concert with ostree. At some point we'll flesh out
+  # the full plan in https://github.com/coreos/fedora-coreos-tracker/issues/47
+
+remove-from-packages:
+- [grub2-tools, /etc/grub.d/08_fallback_counting,
+                  /etc/grub.d/10_reset_boot_success,
+                  /etc/grub.d/12_menu_auto_hide,
+                  /usr/lib/systemd/.*]
+
+