tree: promote changes from next at e63323c

coreos · May 4, 2021 · a1fe074 · a1fe074
1 parent 5cebfac
commit a1fe074
Show file tree

Hide file tree

Showing 3 changed files with 425 additions and 441 deletions.
diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml
@@ -1,16 +1,13 @@
 packages:
-  # Keep this until we move to Fedora 34.
-  # https://github.com/coreos/fedora-coreos-tracker/issues/649
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1892235#c25
-  systemd:
-    evr: 246.7-1.fc33
-  systemd-container:
-    evr: 246.7-1.fc33
-  systemd-libs:
-    evr: 246.7-1.fc33
-  systemd-pam:
-    evr: 246.7-1.fc33
-  systemd-rpm-macros:
-    evra: 246.7-1.fc33.noarch
-  systemd-udev:
-    evr: 246.7-1.fc33
+  # Fast-track moby-engine to fix RPC errors
+  # https://github.com/coreos/fedora-coreos-tracker/issues/793
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2021-b0fd322536
+  moby-engine:
+      evr: 20.10.6-1.fc34
+
+  #############################################
+  # updates to prevent downgrades from f33->f34
+  #############################################
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2021-39df52b880
+  fstrm:
+    evr: 0.6.1-2.fc34