diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json index 8ac4120171..dfe0f72694 100644 --- a/manifest-lock.aarch64.json +++ b/manifest-lock.aarch64.json @@ -52,10 +52,10 @@ "evra": "3.1.2-4.fc39.aarch64" }, "authselect": { - "evra": "1.4.2-3.fc39.aarch64" + "evra": "1.4.3-1.fc39.aarch64" }, "authselect-libs": { - "evra": "1.4.2-3.fc39.aarch64" + "evra": "1.4.3-1.fc39.aarch64" }, "avahi-libs": { "evra": "0.8-24.fc39.aarch64" @@ -73,13 +73,13 @@ "evra": "1:2.11-12.fc39.noarch" }, "bind-libs": { - "evra": "32:9.18.17-1.fc39.aarch64" + "evra": "32:9.18.19-1.fc39.aarch64" }, "bind-license": { - "evra": "32:9.18.17-1.fc39.noarch" + "evra": "32:9.18.19-1.fc39.noarch" }, "bind-utils": { - "evra": "32:9.18.17-1.fc39.aarch64" + "evra": "32:9.18.19-1.fc39.aarch64" }, "bootupd": { "evra": "0.2.11-3.fc39.aarch64" @@ -148,7 +148,7 @@ "evra": "0.21.3-6.fc39.noarch" }, "container-selinux": { - "evra": "2:2.221.1-1.fc39.noarch" + "evra": "2:2.222.0-1.fc39.noarch" }, "containerd": { "evra": "1.6.19-2.fc39.aarch64" @@ -187,10 +187,10 @@ "evra": "3.18-3.fc39.aarch64" }, "crun": { - "evra": "1.9-1.fc39.aarch64" + "evra": "1.9.2-1.fc39.aarch64" }, "crun-wasm": { - "evra": "1.9-1.fc39.aarch64" + "evra": "1.9.2-1.fc39.aarch64" }, "crypto-policies": { "evra": "20230731-1.git5ed06e0.fc39.noarch" @@ -358,7 +358,7 @@ "evra": "3.16.1-1.fc39.aarch64" }, "fwupd": { - "evra": "1.9.5-1.fc39.aarch64" + "evra": "1.9.5-2.fc39.aarch64" }, "gawk": { "evra": "5.2.2-2.fc39.aarch64" @@ -385,16 +385,16 @@ "evra": "2.78.0-3.fc39.aarch64" }, "glibc": { - "evra": "2.38-4.fc39.aarch64" + "evra": "2.38-6.fc39.aarch64" }, "glibc-common": { - "evra": "2.38-4.fc39.aarch64" + "evra": "2.38-6.fc39.aarch64" }, "glibc-gconv-extra": { - "evra": "2.38-4.fc39.aarch64" + "evra": "2.38-6.fc39.aarch64" }, "glibc-minimal-langpack": { - "evra": "2.38-4.fc39.aarch64" + "evra": "2.38-6.fc39.aarch64" }, "gmp": { "evra": "1:6.2.1-5.fc39.aarch64" @@ -727,7 +727,7 @@ "evra": "2.0.0-6.fc39.aarch64" }, "libnvme": { - "evra": "1.5-3.fc39.aarch64" + "evra": "1.6-1.fc39.aarch64" }, "libpath_utils": { "evra": "0.2.1-54.fc39.aarch64" @@ -1141,7 +1141,7 @@ "evra": "15.6-2.aarch64" }, "skopeo": { - "evra": "1:1.13.2-1.fc39.aarch64" + "evra": "1:1.13.3-1.fc39.aarch64" }, "slang": { "evra": "2.3.3-3.fc38.aarch64" @@ -1201,22 +1201,22 @@ "evra": "1.9.14-1.p3.fc39.aarch64" }, "systemd": { - "evra": "254.1-2.fc39.aarch64" + "evra": "254.5-2.fc39.aarch64" }, "systemd-container": { - "evra": "254.1-2.fc39.aarch64" + "evra": "254.5-2.fc39.aarch64" }, "systemd-libs": { - "evra": "254.1-2.fc39.aarch64" + "evra": "254.5-2.fc39.aarch64" }, "systemd-pam": { - "evra": "254.1-2.fc39.aarch64" + "evra": "254.5-2.fc39.aarch64" }, "systemd-resolved": { - "evra": "254.1-2.fc39.aarch64" + "evra": "254.5-2.fc39.aarch64" }, "systemd-udev": { - "evra": "254.1-2.fc39.aarch64" + "evra": "254.5-2.fc39.aarch64" }, "tar": { "evra": "2:1.35-2.fc39.aarch64" @@ -1292,13 +1292,13 @@ } }, "metadata": { - "generated": "2023-10-02T00:00:00Z", + "generated": "2023-10-06T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-01T23:23:09Z" + "generated": "2023-10-06T14:48:12Z" }, "fedora-next": { - "generated": "2023-10-02T09:52:14Z" + "generated": "2023-10-06T09:48:10Z" }, "fedora-next-updates": { "generated": "2018-02-20T19:13:29Z" diff --git a/manifest-lock.overrides.aarch64.yaml b/manifest-lock.overrides.aarch64.yaml new file mode 100644 index 0000000000..123b1eb82a --- /dev/null +++ b/manifest-lock.overrides.aarch64.yaml @@ -0,0 +1,17 @@ +# This lockfile should be used to pin to a package version (`type: pin`) or to +# fast-track packages ahead of Bodhi (`type: fast-track`). Fast-tracked +# packages will automatically be removed once they are in the stable repos. +# +# IMPORTANT: YAML comments *will not* be preserved. All `pin` overrides *must* +# include a URL in the `metadata.reason` key. Overrides of type `fast-track` +# *should* include a Bodhi update URL in the `metadata.bodhi` key and a URL +# in the `metadata.reason` key, though it's acceptable to omit a `reason` +# for FCOS-specific packages (ignition, afterburn, etc.). + +packages: + crun-wasm: + evra: 1.9.2-1.fc39.aarch64 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml new file mode 100644 index 0000000000..80ac49d231 --- /dev/null +++ b/manifest-lock.overrides.x86_64.yaml @@ -0,0 +1,17 @@ +# This lockfile should be used to pin to a package version (`type: pin`) or to +# fast-track packages ahead of Bodhi (`type: fast-track`). Fast-tracked +# packages will automatically be removed once they are in the stable repos. +# +# IMPORTANT: YAML comments *will not* be preserved. All `pin` overrides *must* +# include a URL in the `metadata.reason` key. Overrides of type `fast-track` +# *should* include a Bodhi update URL in the `metadata.bodhi` key and a URL +# in the `metadata.reason` key, though it's acceptable to omit a `reason` +# for FCOS-specific packages (ignition, afterburn, etc.). + +packages: + crun-wasm: + evra: 1.9.2-1.fc39.x86_64 + metadata: + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml index 1e91a953bd..a42a4ee232 100644 --- a/manifest-lock.overrides.yaml +++ b/manifest-lock.overrides.yaml @@ -9,32 +9,38 @@ # for FCOS-specific packages (ignition, afterburn, etc.). packages: - containerd: - evr: 1.6.19-2.fc39 + bind-libs: + evr: 32:9.18.19-1.fc39 metadata: - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1578 - type: pin - glibc: - evr: 2.38-6.fc39 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-b4acb0f7c6 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 + type: fast-track + bind-license: + evra: 32:9.18.19-1.fc39.noarch metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-b4acb0f7c6 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track - glibc-common: - evr: 2.38-6.fc39 + bind-utils: + evr: 32:9.18.19-1.fc39 metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-b4acb0f7c6 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track - glibc-gconv-extra: - evr: 2.38-6.fc39 + containerd: + evr: 1.6.19-2.fc39 + metadata: + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1578 + type: pin + crun: + evr: 1.9.2-1.fc39 metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-3e03106a9e + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track - glibc-minimal-langpack: - evr: 2.38-6.fc39 + skopeo: + evr: 1:1.13.3-1.fc39 metadata: - bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-63e5a77522 - reason: https://github.com/coreos/fedora-coreos-tracker/issues/1591 + bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-35b56210f0 + reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 type: fast-track diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json index 47ada0ff11..48479539ea 100644 --- a/manifest-lock.ppc64le.json +++ b/manifest-lock.ppc64le.json @@ -52,10 +52,10 @@ "evra": "3.1.2-4.fc39.ppc64le" }, "authselect": { - "evra": "1.4.2-3.fc39.ppc64le" + "evra": "1.4.3-1.fc39.ppc64le" }, "authselect-libs": { - "evra": "1.4.2-3.fc39.ppc64le" + "evra": "1.4.3-1.fc39.ppc64le" }, "avahi-libs": { "evra": "0.8-24.fc39.ppc64le" @@ -76,13 +76,13 @@ "evra": "1.07.1-19.fc39.ppc64le" }, "bind-libs": { - "evra": "32:9.18.17-1.fc39.ppc64le" + "evra": "32:9.18.19-1.fc39.ppc64le" }, "bind-license": { - "evra": "32:9.18.17-1.fc39.noarch" + "evra": "32:9.18.19-1.fc39.noarch" }, "bind-utils": { - "evra": "32:9.18.17-1.fc39.ppc64le" + "evra": "32:9.18.19-1.fc39.ppc64le" }, "brcmfmac-firmware": { "evra": "20230919-1.fc39.noarch" @@ -148,7 +148,7 @@ "evra": "0.21.3-6.fc39.noarch" }, "container-selinux": { - "evra": "2:2.221.1-1.fc39.noarch" + "evra": "2:2.222.0-1.fc39.noarch" }, "containerd": { "evra": "1.6.19-2.fc39.ppc64le" @@ -187,7 +187,7 @@ "evra": "3.18-3.fc39.ppc64le" }, "crun": { - "evra": "1.9-1.fc39.ppc64le" + "evra": "1.9.2-1.fc39.ppc64le" }, "crypto-policies": { "evra": "20230731-1.git5ed06e0.fc39.noarch" @@ -343,7 +343,7 @@ "evra": "3.16.1-1.fc39.ppc64le" }, "fwupd": { - "evra": "1.9.5-1.fc39.ppc64le" + "evra": "1.9.5-2.fc39.ppc64le" }, "gawk": { "evra": "5.2.2-2.fc39.ppc64le" @@ -370,16 +370,16 @@ "evra": "2.78.0-3.fc39.ppc64le" }, "glibc": { - "evra": "2.38-4.fc39.ppc64le" + "evra": "2.38-6.fc39.ppc64le" }, "glibc-common": { - "evra": "2.38-4.fc39.ppc64le" + "evra": "2.38-6.fc39.ppc64le" }, "glibc-gconv-extra": { - "evra": "2.38-4.fc39.ppc64le" + "evra": "2.38-6.fc39.ppc64le" }, "glibc-minimal-langpack": { - "evra": "2.38-4.fc39.ppc64le" + "evra": "2.38-6.fc39.ppc64le" }, "gmp": { "evra": "1:6.2.1-5.fc39.ppc64le" @@ -712,7 +712,7 @@ "evra": "2.0.0-6.fc39.ppc64le" }, "libnvme": { - "evra": "1.5-3.fc39.ppc64le" + "evra": "1.6-1.fc39.ppc64le" }, "libpath_utils": { "evra": "0.2.1-54.fc39.ppc64le" @@ -1138,7 +1138,7 @@ "evra": "2.2-4.fc39.ppc64le" }, "skopeo": { - "evra": "1:1.13.2-1.fc39.ppc64le" + "evra": "1:1.13.3-1.fc39.ppc64le" }, "slang": { "evra": "2.3.3-3.fc38.ppc64le" @@ -1195,22 +1195,22 @@ "evra": "1.9.14-1.p3.fc39.ppc64le" }, "systemd": { - "evra": "254.1-2.fc39.ppc64le" + "evra": "254.5-2.fc39.ppc64le" }, "systemd-container": { - "evra": "254.1-2.fc39.ppc64le" + "evra": "254.5-2.fc39.ppc64le" }, "systemd-libs": { - "evra": "254.1-2.fc39.ppc64le" + "evra": "254.5-2.fc39.ppc64le" }, "systemd-pam": { - "evra": "254.1-2.fc39.ppc64le" + "evra": "254.5-2.fc39.ppc64le" }, "systemd-resolved": { - "evra": "254.1-2.fc39.ppc64le" + "evra": "254.5-2.fc39.ppc64le" }, "systemd-udev": { - "evra": "254.1-2.fc39.ppc64le" + "evra": "254.5-2.fc39.ppc64le" }, "tar": { "evra": "2:1.35-2.fc39.ppc64le" @@ -1283,13 +1283,13 @@ } }, "metadata": { - "generated": "2023-10-02T00:00:00Z", + "generated": "2023-10-06T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-01T23:23:25Z" + "generated": "2023-10-06T14:47:45Z" }, "fedora-next": { - "generated": "2023-10-02T09:52:11Z" + "generated": "2023-10-06T09:48:08Z" }, "fedora-next-updates": { "generated": "2018-02-28T16:06:00Z" diff --git a/manifest-lock.s390x.json b/manifest-lock.s390x.json index c4c0e05081..13374d81a9 100644 --- a/manifest-lock.s390x.json +++ b/manifest-lock.s390x.json @@ -52,10 +52,10 @@ "evra": "3.1.2-4.fc39.s390x" }, "authselect": { - "evra": "1.4.2-3.fc39.s390x" + "evra": "1.4.3-1.fc39.s390x" }, "authselect-libs": { - "evra": "1.4.2-3.fc39.s390x" + "evra": "1.4.3-1.fc39.s390x" }, "avahi-libs": { "evra": "0.8-24.fc39.s390x" @@ -73,13 +73,13 @@ "evra": "1:2.11-12.fc39.noarch" }, "bind-libs": { - "evra": "32:9.18.17-1.fc39.s390x" + "evra": "32:9.18.19-1.fc39.s390x" }, "bind-license": { - "evra": "32:9.18.17-1.fc39.noarch" + "evra": "32:9.18.19-1.fc39.noarch" }, "bind-utils": { - "evra": "32:9.18.17-1.fc39.s390x" + "evra": "32:9.18.19-1.fc39.s390x" }, "brcmfmac-firmware": { "evra": "20230919-1.fc39.noarch" @@ -145,7 +145,7 @@ "evra": "0.21.3-6.fc39.noarch" }, "container-selinux": { - "evra": "2:2.221.1-1.fc39.noarch" + "evra": "2:2.222.0-1.fc39.noarch" }, "containerd": { "evra": "1.6.19-2.fc39.s390x" @@ -184,7 +184,7 @@ "evra": "3.18-3.fc39.s390x" }, "crun": { - "evra": "1.9-1.fc39.s390x" + "evra": "1.9.2-1.fc39.s390x" }, "crypto-policies": { "evra": "20230731-1.git5ed06e0.fc39.noarch" @@ -340,7 +340,7 @@ "evra": "3.16.1-1.fc39.s390x" }, "fwupd": { - "evra": "1.9.5-1.fc39.s390x" + "evra": "1.9.5-2.fc39.s390x" }, "gawk": { "evra": "5.2.2-2.fc39.s390x" @@ -358,16 +358,16 @@ "evra": "2.78.0-3.fc39.s390x" }, "glibc": { - "evra": "2.38-4.fc39.s390x" + "evra": "2.38-6.fc39.s390x" }, "glibc-common": { - "evra": "2.38-4.fc39.s390x" + "evra": "2.38-6.fc39.s390x" }, "glibc-gconv-extra": { - "evra": "2.38-4.fc39.s390x" + "evra": "2.38-6.fc39.s390x" }, "glibc-minimal-langpack": { - "evra": "2.38-4.fc39.s390x" + "evra": "2.38-6.fc39.s390x" }, "gmp": { "evra": "1:6.2.1-5.fc39.s390x" @@ -682,7 +682,7 @@ "evra": "2.0.0-6.fc39.s390x" }, "libnvme": { - "evra": "1.5-3.fc39.s390x" + "evra": "1.6-1.fc39.s390x" }, "libpath_utils": { "evra": "0.2.1-54.fc39.s390x" @@ -1087,7 +1087,7 @@ "evra": "2.2-4.fc39.s390x" }, "skopeo": { - "evra": "1:1.13.2-1.fc39.s390x" + "evra": "1:1.13.3-1.fc39.s390x" }, "slang": { "evra": "2.3.3-3.fc38.s390x" @@ -1144,22 +1144,22 @@ "evra": "1.9.14-1.p3.fc39.s390x" }, "systemd": { - "evra": "254.1-2.fc39.s390x" + "evra": "254.5-2.fc39.s390x" }, "systemd-container": { - "evra": "254.1-2.fc39.s390x" + "evra": "254.5-2.fc39.s390x" }, "systemd-libs": { - "evra": "254.1-2.fc39.s390x" + "evra": "254.5-2.fc39.s390x" }, "systemd-pam": { - "evra": "254.1-2.fc39.s390x" + "evra": "254.5-2.fc39.s390x" }, "systemd-resolved": { - "evra": "254.1-2.fc39.s390x" + "evra": "254.5-2.fc39.s390x" }, "systemd-udev": { - "evra": "254.1-2.fc39.s390x" + "evra": "254.5-2.fc39.s390x" }, "tar": { "evra": "2:1.35-2.fc39.s390x" @@ -1235,13 +1235,13 @@ } }, "metadata": { - "generated": "2023-10-02T00:00:00Z", + "generated": "2023-10-06T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-01T23:22:17Z" + "generated": "2023-10-06T14:47:30Z" }, "fedora-next": { - "generated": "2023-10-02T09:52:01Z" + "generated": "2023-10-06T09:48:00Z" }, "fedora-next-updates": { "generated": "2018-02-28T16:06:49Z" diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json index f246e5bd17..b984c2c5b8 100644 --- a/manifest-lock.x86_64.json +++ b/manifest-lock.x86_64.json @@ -52,10 +52,10 @@ "evra": "3.1.2-4.fc39.x86_64" }, "authselect": { - "evra": "1.4.2-3.fc39.x86_64" + "evra": "1.4.3-1.fc39.x86_64" }, "authselect-libs": { - "evra": "1.4.2-3.fc39.x86_64" + "evra": "1.4.3-1.fc39.x86_64" }, "avahi-libs": { "evra": "0.8-24.fc39.x86_64" @@ -73,13 +73,13 @@ "evra": "1:2.11-12.fc39.noarch" }, "bind-libs": { - "evra": "32:9.18.17-1.fc39.x86_64" + "evra": "32:9.18.19-1.fc39.x86_64" }, "bind-license": { - "evra": "32:9.18.17-1.fc39.noarch" + "evra": "32:9.18.19-1.fc39.noarch" }, "bind-utils": { - "evra": "32:9.18.17-1.fc39.x86_64" + "evra": "32:9.18.19-1.fc39.x86_64" }, "bootupd": { "evra": "0.2.11-3.fc39.x86_64" @@ -148,7 +148,7 @@ "evra": "0.21.3-6.fc39.noarch" }, "container-selinux": { - "evra": "2:2.221.1-1.fc39.noarch" + "evra": "2:2.222.0-1.fc39.noarch" }, "containerd": { "evra": "1.6.19-2.fc39.x86_64" @@ -187,10 +187,10 @@ "evra": "3.18-3.fc39.x86_64" }, "crun": { - "evra": "1.9-1.fc39.x86_64" + "evra": "1.9.2-1.fc39.x86_64" }, "crun-wasm": { - "evra": "1.9-1.fc39.x86_64" + "evra": "1.9.2-1.fc39.x86_64" }, "crypto-policies": { "evra": "20230731-1.git5ed06e0.fc39.noarch" @@ -358,7 +358,7 @@ "evra": "3.16.1-1.fc39.x86_64" }, "fwupd": { - "evra": "1.9.5-1.fc39.x86_64" + "evra": "1.9.5-2.fc39.x86_64" }, "gawk": { "evra": "5.2.2-2.fc39.x86_64" @@ -385,16 +385,16 @@ "evra": "2.78.0-3.fc39.x86_64" }, "glibc": { - "evra": "2.38-4.fc39.x86_64" + "evra": "2.38-6.fc39.x86_64" }, "glibc-common": { - "evra": "2.38-4.fc39.x86_64" + "evra": "2.38-6.fc39.x86_64" }, "glibc-gconv-extra": { - "evra": "2.38-4.fc39.x86_64" + "evra": "2.38-6.fc39.x86_64" }, "glibc-minimal-langpack": { - "evra": "2.38-4.fc39.x86_64" + "evra": "2.38-6.fc39.x86_64" }, "gmp": { "evra": "1:6.2.1-5.fc39.x86_64" @@ -730,7 +730,7 @@ "evra": "2.0.0-6.fc39.x86_64" }, "libnvme": { - "evra": "1.5-3.fc39.x86_64" + "evra": "1.6-1.fc39.x86_64" }, "libpath_utils": { "evra": "0.2.1-54.fc39.x86_64" @@ -1144,7 +1144,7 @@ "evra": "15.6-2.x86_64" }, "skopeo": { - "evra": "1:1.13.2-1.fc39.x86_64" + "evra": "1:1.13.3-1.fc39.x86_64" }, "slang": { "evra": "2.3.3-3.fc38.x86_64" @@ -1204,22 +1204,22 @@ "evra": "1.9.14-1.p3.fc39.x86_64" }, "systemd": { - "evra": "254.1-2.fc39.x86_64" + "evra": "254.5-2.fc39.x86_64" }, "systemd-container": { - "evra": "254.1-2.fc39.x86_64" + "evra": "254.5-2.fc39.x86_64" }, "systemd-libs": { - "evra": "254.1-2.fc39.x86_64" + "evra": "254.5-2.fc39.x86_64" }, "systemd-pam": { - "evra": "254.1-2.fc39.x86_64" + "evra": "254.5-2.fc39.x86_64" }, "systemd-resolved": { - "evra": "254.1-2.fc39.x86_64" + "evra": "254.5-2.fc39.x86_64" }, "systemd-udev": { - "evra": "254.1-2.fc39.x86_64" + "evra": "254.5-2.fc39.x86_64" }, "tar": { "evra": "2:1.35-2.fc39.x86_64" @@ -1295,13 +1295,13 @@ } }, "metadata": { - "generated": "2023-10-02T00:00:00Z", + "generated": "2023-10-06T00:00:00Z", "rpmmd_repos": { "fedora-coreos-pool": { - "generated": "2023-10-01T23:23:20Z" + "generated": "2023-10-06T14:48:21Z" }, "fedora-next": { - "generated": "2023-10-02T09:52:22Z" + "generated": "2023-10-06T09:48:20Z" }, "fedora-next-updates": { "generated": "2018-02-20T19:18:14Z" diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.service index 9703eec33a..b08c827bc5 100644 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.service +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.service @@ -18,13 +18,13 @@ DefaultDependencies=false Before=ignition-mount.service Before=ignition-complete.target -# Since we are tearing down networking using NetworkManager itself -# we need to make sure NetworkManager is running. Similarly -# dbus-broker since nmcli talks to the daemon via DBUS. Since the -# ordering for ExecStop is the opposite of ExecStart we need to use -# `After=` here. -After=nm-initrd.service -After=dbus-broker.service +# Since we are tearing down networking we need to make sure +# NetworkManager has been stopped, otherwise it'll be trying +# to react to our delete/down operations. Since the ordering +# for ExecStop is the opposite of ExecStart we need to use +# `Before=nm-initrd.service`. +# https://issues.redhat.com/browse/OCPBUGS-11052 +Before=nm-initrd.service # Make sure ExecStop= runs before we switch root Conflicts=initrd-switch-root.target umount.target diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.sh b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.sh index afe69a99b4..35d681418b 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.sh +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.sh @@ -182,15 +182,55 @@ propagate_ifname_udev_rules() { fi } +down_interface() { + echo "info: taking down network device: $1" + # On recommendation from the NM team let's try to delete the device + # first and if that doesn't work then set it to down and flush any + # associated addresses. Deleting virtual devices (bonds, teams, bridges, + # ip-tunnels, etc) will clean up any associated kernel resources. A real + # device can't be deleted so that will fail and we'll fallback to setting + # it down and flushing addresses. + if ! ip link delete $1; then + ip link set $1 down + ip addr flush dev $1 + fi +} + +# Iterate through the interfaces in the machine and take them down. +# Note that in the future we would like to possibly use `nmcli` networking off` +# for this. See the following two comments for details: +# https://github.com/coreos/fedora-coreos-tracker/issues/394#issuecomment-599721763 +# https://github.com/coreos/fedora-coreos-tracker/issues/394#issuecomment-599746049 +down_interfaces() { + if ! [ -z "$(ls /sys/class/net)" ]; then + for f in /sys/class/net/*; do + interface=$(basename "$f") + # The `bonding_masters` entry is not a true interface and thus + # cannot be taken down. Also skip local loopback + case "$interface" in + "lo" | "bonding_masters") + continue + ;; + esac + # When we start taking down devices some other devices can + # start to disappear (for example vlan on top of interface). + # If the device we're about to take down has disappeared + # since the start of this loop then skip taking it down. + if [ ! -e "$f" ]; then + echo "info: skipping teardown of ${interface}; no longer exists." + continue + fi + down_interface $interface + done + fi +} + main() { # Load libraries from dracut load_dracut_libs - # Take down all networking set up in the initramfs - if systemctl is-active --quiet nm-initrd.service; then - echo "info: taking down initramfs networking" - nmcli networking off - fi + # Take down all interfaces set up in the initramfs + down_interfaces # Clean up all routing echo "info: flushing all routing" @@ -209,13 +249,10 @@ main() { propagate_ifname_udev_rules fi - # Configuration has been propagated, but we can't clean up - # /run/NetworkManager because NM is still running. Let's drop - # down a tmpfiles.d snippet so that it's cleaned up first thing - # in the real root. Doing it this way prevents us having to write - # another unit to do the cleanup after this service has finished. - echo "R! /run/NetworkManager - - - - -" > \ - /run/tmpfiles.d/15-teardown-initramfs-networkmanager.conf + # Now that the configuration has been propagated (or not) + # clean it up so that no information from outside of the + # real root is passed on to NetworkManager in the real root + rm -rf /run/NetworkManager/ rm -f /run/udev/rules.d/80-coreos-boot-disk.rules rm -f /dev/disk/by-id/coreos-boot-disk diff --git a/tests/kola/docker/basic b/tests/kola/docker/basic index 7ab6bf9979..c1cbafcc1f 100755 --- a/tests/kola/docker/basic +++ b/tests/kola/docker/basic @@ -2,6 +2,8 @@ ## kola: ## # Must not run this test with another podman test ## exclusive: true +## # We only ship moby/docker in FCOS +## distros: fcos ## # This test pulls a container image from remote sources. ## tags: "platform-independent needs-internet" ## description: Verify that running a basic container with docker works.