Merge branch 'f41_tier0_cryptsetup' into 'f41'

[F41] cherry-picked fixes for dracut modules See merge request fedora/bootc/base-images!38
tier-0: add systemd-cryptsetup to initrd dracut modules
2024-08-29 13:59:30 +00:00 · 2024-08-29 09:48:36 -04:00 · 2024-08-29 09:48:19 -04:00 · 2024-08-21 15:28:49 +00:00 · 2024-08-19 09:27:50 -04:00 · 2024-08-12 14:06:27 +00:00
12 changed files with 32 additions and 93 deletions
@@ -1,7 +1,7 @@
 ---
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v4.6.0
    hooks:
      - id: end-of-file-fixer
      - id: trailing-whitespace
@@ -23,7 +23,7 @@
 # Because it's generating a base image and uses containerbuildcontextization features itself.
 # In the future some of this can be lifted.

-FROM quay.io/fedora/fedora:40 as repos
+FROM quay.io/fedora/fedora:41 as repos

 FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
 ARG MANIFEST=fedora-bootc.yaml
@@ -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": [
@@ -1,15 +1,12 @@
-releasever: 40
-variables:
-  distro: "fedora"
-
+releasever: 41
 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
@@ -0,0 +1,7 @@
+variables:
+  distro: "fedora"
+
+# Fedora-specific packages here
+packages:
+  # https://gitlab.com/fedora/bootc/base-images/-/issues/12
+  - fedora-repos-archive
@@ -1,15 +1,12 @@
-releasever: 40
-variables:
-  distro: "fedora"
-
+releasever: 41
 repos:
-  - fedora-devel
-  - fedora-updates
+  - fedora

 metadata:
  name: fedora-boot-tier0
  summary: Fedora Bootable Tier 0

 include:
+  - fedora-generic.yaml
  - tier-0/manifest.yaml
  - tier-0/kernel.yaml
@@ -3,8 +3,8 @@

 [fedora]
 name=Fedora $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
+# using the Latest Fedora 41 repository from Koji until GA
+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
@@ -3,10 +3,12 @@
  "extends": [
    "github>platform-engineering-org/.github"
  ],
+  "baseBranches": ["main", "f40"],
  "packageRules": [
    {
      "matchPackageNames": ["quay.io/fedora/fedora"],
-      "allowedVersions": "=40"
+      "allowedVersions": "=40",
+      "matchBaseBranches": ["f40"]
    }
  ]
 }
@@ -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
@@ -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
@@ -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)
@@ -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
Author	SHA1	Message	Date
Colin Walters (Red Hat)	05a724d656	Merge branch 'f41_tier0_cryptsetup' into 'f41' [F41] cherry-picked fixes for dracut modules See merge request fedora/bootc/base-images!38	2024-08-29 13:59:30 +00:00
Micah Abbott	92545d027d	tier-0: add systemd-cryptsetup to initrd dracut modules Fedora 41 appears to require the inclusion of `systemd-cryptsetup` in the initrd in order to unlock LUKS devices at boot. See: #17 Signed-off-by: Micah Abbott <miabbott@redhat.com> (cherry picked from commit `7109132dd6`)	2024-08-29 09:48:36 -04:00
Colin Walters	7d31fac720	initramfs: Switch to `add_dracutmodules` Per discussion in https://github.com/rhkdump/kdump-utils/pull/29#issuecomment-2303932537 This would have avoided kdump breakage, and the original motivation of avoiding dracut error spam from missing things is gone now that Fedora is using dracut-ng which has https://github.com/dracut-ng/dracut-ng/commit/d73cc24e112c01aa701a96a7b8a58adce78409e7 (cherry picked from commit `0da319f566`)	2024-08-29 09:48:19 -04:00
pbrobinson	b92b1b9ddd	Merge branch 'f41-branching' into 'f41' Branching Fedora 41 from Rawhide See merge request fedora/bootc/base-images!35	2024-08-21 15:28:49 +00:00
Paul Whalen	e070839bff	Branching Fedora 41 from Rawhide Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>	2024-08-19 09:27:50 -04:00
Colin Walters (Red Hat)	0858175b46	Merge branch 'fix_growpart' into 'main' tier-1/gropwart: bail early on devicemapper targets See merge request fedora/bootc/base-images!33	2024-08-12 14:06:27 +00:00
Micah Abbott	e99b62981a	tier-1/gropwart: bail early on devicemapper targets If the growpart script detects a DM target, exit early. Signed-off-by: Micah Abbott <miabbott@redhat.com>	2024-08-09 16:50:14 -04:00
Colin Walters (Red Hat)	40df0eb382	Merge branch 'fips' into 'main' initramfs-full: Add fips See merge request fedora/bootc/base-images!31	2024-07-02 17:25:07 +00:00
Colin Walters	73fca28298	initramfs-full: Add fips Part of enabling FIPS support by default. See also https://gitlab.com/fedora/bootc/examples/-/merge_requests/49	2024-07-01 20:46:05 -04:00
Liora Milbaum	3237cc0a8e	Merge branch 'renovate/main-all' into 'main' chore(deps): update pre-commit hook pre-commit/pre-commit-hooks to v4.6.0 (main) See merge request fedora/bootc/base-images!29	2024-06-03 07:19:46 +00:00
Platform Engineering Bot	7cb7a397aa	chore(deps): update pre-commit hook pre-commit/pre-commit-hooks to v4.6.0 Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>	2024-06-03 00:05:58 +00:00
Colin Walters (Red Hat)	64a741188c	Merge branch 'drop-arch-bootupd-filtering' into 'main' manifest: Unconditionally include bootupd See merge request fedora/bootc/base-images!28	2024-05-29 21:03:23 +00:00
Colin Walters	fb882c9002	manifest: Unconditionally include bootupd It's supported on all architectures now, even if it's a no-op mostly on s390x today. But specifically this will ensure we pull in zipl on s390x, which is needed. Signed-off-by: Colin Walters <walters@verbum.org>	2024-05-29 13:50:59 -04:00
Jonathan Lebon	9ed1a7fef3	Merge branch 'add-archive-repo' into 'main' Add fedora-repos-archive Closes #12 See merge request fedora/bootc/base-images!26	2024-05-29 13:52:34 +00:00
Colin Walters	33ba2536f3	Add fedora-repos-archive For the same reason FCOS has included it forever; it allows some skew between images and the RPM mirrors for version-sensitive things like `kernel-devel`. Closes: https://gitlab.com/fedora/bootc/base-images/-/issues/12 Signed-off-by: Colin Walters <walters@verbum.org>	2024-05-28 17:15:53 -04:00
Liora Milbaum	6beab2a659	Merge branch 'rawhide' into 'main' Only rawhide See merge request fedora/bootc/base-images!25	2024-05-28 17:04:03 +00:00
Liora Milbaum	aaa71e6629	Merge branch 'renovate-config' into 'main' Renovate configuration: f40 branch See merge request fedora/bootc/base-images!24	2024-05-28 16:56:14 +00:00
Liora Milbaum	f870a77a25	Only rawhide	2024-05-28 19:53:56 +03:00
Liora Milbaum	243848c59b	Renovate configuration: f40 branch	2024-05-28 19:37:17 +03:00