Merge branch 'f41_tier0_cryptsetup' into 'f41'

[F41] cherry-picked fixes for dracut modules

See merge request fedora/bootc/base-images!38

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

Containerfile

@@ -23,8 +23,7 @@
 # Because it's generating a base image and uses containerbuildcontextization features itself.
 # In the future some of this can be lifted.
 
-# renovate: datasource=endoflife-date depName=fedora versioning=docker
+FROM quay.io/fedora/fedora:41 as repos
-FROM quay.io/fedora/fedora:40 as repos
 
 FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
 ARG MANIFEST=fedora-bootc.yaml

fedora-bootc-config.json

@@ -3,7 +3,7 @@
         "containers.bootc": "1",
         "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
         "redhat.id": "fedora",
-        "redhat.version-id": "40"
+        "redhat.version-id": "41"
     },
     "StopSignal": "SIGRTMIN+3",
     "Env": [

fedora-bootc-rawhide.yaml

@@ -1,14 +0,0 @@
-releasever: rawhide
-variables:
-  distro: "fedora"
-
-repos:
-  - rawhide
-
-metadata:
-  name: fedora-boot-tier1
-  summary: Fedora Bootable Tier 1
-
-include:
-  - tier-1/manifest.yaml
-  - tier-1/kernel.yaml

fedora-bootc.yaml

@@ -1,15 +1,12 @@
-releasever: 40
+releasever: 41
-variables:
-  distro: "fedora"
-
 repos:
   - fedora
-  - updates
 
 metadata:
   name: fedora-boot-tier1
   summary: Fedora Bootable Tier 1
 
 include:
+  - fedora-generic.yaml
   - tier-1/manifest.yaml
   - tier-1/kernel.yaml

fedora-eln-bootc.yaml

@@ -1,15 +0,0 @@
-releasever: 39
-variables:
-  distro: "eln"
-
-repos:
-  - eln-baseos
-  - eln-appstream
-
-metadata:
-  name: fedora-boot-tier1
-  summary: Fedora Bootable Tier 1
-
-include:
-  - tier-1/manifest.yaml
-  - tier-1/kernel.yaml

fedora-eln.repo

@@ -1,408 +0,0 @@
-# These packages are untested and still under development. This
-# repository is used for development of new releases.
-#
-# This repository can see significant daily turnover and major
-# functionality changes which cause unexpected problems with other
-# development packages. Please use these packages if you want to work
-# with the Fedora developers by testing these new development packages.
-#
-# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
-# Required) is available as a discussion forum for
-# testing and troubleshooting for development packages in conjunction
-# with new test releases.
-#
-# More information is available at http://fedoraproject.org/wiki/Testing
-#
-# Reproducible and reportable issues should be filed at
-# http://bugzilla.redhat.com/.
-#
-# Product: Fedora
-# Version: eln
-
-[eln-baseos]
-name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/BaseOS/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-baseos-debuginfo]
-name=Fedora - ELN BaseOS - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/BaseOS/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-baseos-source]
-name=Fedora - ELN BaseOS - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/BaseOS/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-appstream]
-name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/AppStream/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-appstream-debuginfo]
-name=Fedora - ELN AppStream - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/AppStream/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-appstream-source]
-name=Fedora - ELN AppStream - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/AppStream/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-crb]
-name=Fedora - ELN CRB - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/CRB/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-crb-debuginfo]
-name=Fedora - ELN CRB - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/CRB/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-crb-source]
-name=Fedora - ELN CRB - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/CRB/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-extras]
-name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/Extras/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-extras-debuginfo]
-name=Fedora - ELN Extras - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/Extras/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-extras-source]
-name=Fedora - ELN Extras - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/Extras/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-ha]
-name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/HighAvailability/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-ha-debuginfo]
-name=Fedora - ELN HighAvailability - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/HighAvailability/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-ha-source]
-name=Fedora - ELN HighAvailability - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/HighAvailability/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-rs]
-name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/ResilientStorage/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-rs-debuginfo]
-name=Fedora - ELN ResilientStorage - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/ResilientStorage/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-rs-source]
-name=Fedora - ELN ResilientStorage - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/ResilientStorage/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-rt]
-name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/RT/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-rt-debuginfo]
-name=Fedora - ELN RT - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/RT/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-rt-source]
-name=Fedora - ELN RT - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/RT/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-nfv]
-name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/NFV/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-nfv-debuginfo]
-name=Fedora - ELN NFV - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/NFV/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-nfv-source]
-name=Fedora - ELN NFV - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/NFV/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-sap]
-name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAP/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-sap-debuginfo]
-name=Fedora - ELN SAP - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAP/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-sap-source]
-name=Fedora - ELN SAP - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAP/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-
-
-[eln-saphana]
-name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAPHANA/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-saphana-debuginfo]
-name=Fedora - ELN SAPHANA - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAPHANA/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False
-
-[eln-saphana-source]
-name=Fedora - ELN SAPHANA - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/Fedora-ELN-20240402.2/compose/SAPHANA/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-40-primary
-skip_if_unavailable=False

fedora-generic.yaml

@@ -0,0 +1,7 @@
+variables:
+  distro: "fedora"
+
+# Fedora-specific packages here
+packages:
+  # https://gitlab.com/fedora/bootc/base-images/-/issues/12
+  - fedora-repos-archive

fedora-tier-0-40.yaml

@@ -1,15 +0,0 @@
-releasever: 40
-variables:
-  distro: "fedora"
-
-repos:
-  - fedora-devel
-  - fedora-updates
-
-metadata:
-  name: fedora-boot-tier0
-  summary: Fedora Bootable Tier 0
-
-include:
-  - tier-0/manifest.yaml
-  - tier-0/kernel.yaml

fedora-tier-0-eln.yaml

@@ -1,11 +0,0 @@
-releasever: 39
-variables:
-  distro: "eln"
-
-repos:
-  - eln-baseos
-  - eln-appstream
-
-include:
-  - tier-0/manifest.yaml
-  - tier-0/kernel.yaml

fedora-tier-0.yaml

@@ -1,14 +1,12 @@
-releasever: rawhide
+releasever: 41
-variables:
-  distro: "fedora"
-
 repos:
-  - rawhide
+  - fedora
 
 metadata:
   name: fedora-boot-tier0
   summary: Fedora Bootable Tier 0
 
 include:
+  - fedora-generic.yaml
   - tier-0/manifest.yaml
   - tier-0/kernel.yaml

fedora.repo

@@ -3,8 +3,8 @@
 
 [fedora]
 name=Fedora $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+# using the Latest Fedora 41 repository from Koji until GA
-        https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
+baseurl=https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-41/compose/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=1
 #metadata_expire=7d
@@ -37,66 +37,3 @@ gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
-
-[fedora-modular]
-name=Fedora Modular $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=1
-#metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
-        https://dl.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-updates-testing-modular]
-name=Fedora Modular $releasever - $basearch - Test Updates
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
-        https://dl.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
-
-[rawhide]
-name=Fedora - Rawhide - Developmental packages for the next Fedora release
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-#metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
-
-[fedora-devel]
-name=Fedora $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-#metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False

renovate.json

@@ -2,5 +2,13 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "github>platform-engineering-org/.github"
+  ],
+  "baseBranches": ["main", "f40"],
+  "packageRules": [
+    {
+      "matchPackageNames": ["quay.io/fedora/fedora"],
+      "allowedVersions": "=40",
+      "matchBaseBranches": ["f40"]
+    }
   ]
 }

tier-0/initramfs.yaml

@@ -6,13 +6,13 @@ postprocess:
     cat > /usr/lib/dracut/dracut.conf.d/20-bootc-base.conf << 'EOF'
     # We want a generic image; hostonly makes no sense as part of a server side build
     hostonly=no
-    dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree "
+    add_dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base ostree "
     EOF
     cat > /usr/lib/dracut/dracut.conf.d/22-bootc-generic.conf << 'EOF'
     # Extra modules that we want by default that are known to exist in the kernel
-    dracutmodules+=" virtiofs "
+    add_dracutmodules+=" virtiofs "
     EOF
     cat > /usr/lib/dracut/dracut.conf.d/49-bootc-tpm2-tss.conf << 'EOF'
     # We want this for systemd-cryptsetup tpm2 locking
-    dracutmodules+=" tpm2-tss "
+    add_dracutmodules+=" systemd-cryptsetup tpm2-tss "
     EOF

tier-0/manifest.yaml

@@ -50,6 +50,7 @@ remove-from-packages:
 
 include:
   - bootc.yaml
+  - bootupd.yaml
   - ostree.yaml
   - initramfs.yaml
   - autoupdates.yaml
@@ -65,8 +66,3 @@ packages:
   - container-selinux
   # Needed for tpm2 bound luks
   - tpm2-tools
-
-# See https://github.com/coreos/bootupd
-arch-include:
-  x86_64: bootupd.yaml
-  aarch64: bootupd.yaml

tier-1/bootc-generic-growpart

@@ -3,15 +3,18 @@ set -eu
 
 backing_device=$(findmnt -vno SOURCE /sysroot)
 echo "Backing device: ${backing_device}"
+
+# Handling devicemapper targets is a whole other thing
+case $backing_device in
+    /dev/mapper/*) echo "Not growing $backing_device"; exit 0 ;;
+esac
+
 syspath=/sys/class/block/$(basename "${backing_device}")
 if ! test -d "${syspath}"; then
     echo "failed to find backing device ${syspath}"; exit 1
 fi
 
-# Handling devicemapper targets is a whole other thing
+
-case $backing_device in
-    /dev/mapper/*) "Not growing $backing_device"; exit 0 ;;
-esac
 
 # Note that we expect that the rootfs is on a partition
 partition=$(cat "${syspath}"/partition)

tier-1/initramfs-full.yaml

@@ -4,5 +4,5 @@ postprocess:
     #!/usr/bin/env bash
     mkdir -p /usr/lib/dracut/dracut.conf.d
     cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF'
-    dracutmodules+=" lvm crypt "
+    add_dracutmodules+=" lvm crypt fips "
     EOF