tree: promote changes from testing-devel at 2c54f6f

coreos · Mar 25, 2020 · fed591b · fed591b
1 parent 36d146b
commit fed591b
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 45 deletions.
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
@@ -11,7 +11,7 @@ cosaPod {
         curl -LO https://raw.githubusercontent.com/coreos/fedora-coreos-releng-automation/master/scripts/download-overrides.py
         python3 download-overrides.py
         # prep from the latest builds so that we generate a diff on PRs that add packages
-        cosa buildprep https://builds.coreos.fedoraproject.org/prod/streams/testing-devel/builds
+        cosa buildprep https://builds.coreos.fedoraproject.org/prod/streams/${env.CHANGE_TARGET}/builds
     """)
 
     fcosBuild(skipInit: true)

diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml
@@ -11,3 +11,22 @@ packages:
     evra: 2:1.8.1-2.fc31.x86_64
   podman-plugins:
     evra: 2:1.8.1-2.fc31.x86_64
+  # Cherry-pick new {rpm-,}ostree to resolve issues with /read-only sysroot
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-d920214f63
+  # https://github.com/coreos/fedora-coreos-tracker/issues/343
+  ostree:
+    evra: 2020.3-2.fc31.x86_64
+  ostree-libs:
+    evra: 2020.3-2.fc31.x86_64
+  rpm-ostree:
+    evra: 2020.1.21.ge9011530-2.fc31.x86_64
+  rpm-ostree-libs:
+    evra: 2020.1.21.ge9011530-2.fc31.x86_64
+  # Fast track new Ignition with initramfs network takedown
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-6db5551bf6
+  ignition:
+    evra: 2.2.1-1.git2d3ff58.fc31.x86_64
+  # Fast track new zincati with proxy support
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-6877a1f53d
+  zincati:
+    evra: 0.0.9-1.fc31.x86_64
diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
@@ -88,7 +88,7 @@
       "evra": "5.2-34.fc31.x86_64"
     },
     "conmon": {
-      "evra": "2:2.0.10-2.fc31.x86_64"
+      "evra": "2:2.0.11-1.fc31.x86_64"
     },
     "console-login-helper-messages": {
       "evra": "0.17-1.fc31.noarch"
@@ -133,7 +133,7 @@
       "evra": "2.9.6-21.fc31.x86_64"
     },
     "crun": {
-      "evra": "0.12.2.1-1.fc31.x86_64"
+      "evra": "0.13-1.fc31.x86_64"
     },
     "crypto-policies": {
       "evra": "20191128-5.gitcd267a5.fc32.noarch"
@@ -145,7 +145,7 @@
       "evra": "2.3.0-1.fc31.x86_64"
     },
     "cups-libs": {
-      "evra": "1:2.2.12-3.fc31.x86_64"
+      "evra": "1:2.2.12-6.fc31.x86_64"
     },
     "curl": {
       "evra": "7.66.0-1.fc31.x86_64"
@@ -205,10 +205,10 @@
       "evra": "4.1-9.fc31.x86_64"
     },
     "dracut": {
-      "evra": "049-27.git20181204.fc31.1.x86_64"
+      "evra": "050-26.git20200316.fc31.x86_64"
     },
     "dracut-network": {
-      "evra": "049-27.git20181204.fc31.1.x86_64"
+      "evra": "050-26.git20200316.fc31.x86_64"
     },
     "e2fsprogs": {
       "evra": "1.45.5-1.fc31.x86_64"
@@ -292,10 +292,10 @@
       "evra": "2.9.9-8.fc31.x86_64"
     },
     "fuse-overlayfs": {
-      "evra": "0.7.5-2.fc31.x86_64"
+      "evra": "0.7.6-2.fc31.x86_64"
     },
     "fuse-sshfs": {
-      "evra": "3.7.0-2.fc31.x86_64"
+      "evra": "3.7.0-3.fc31.x86_64"
     },
     "fuse3": {
       "evra": "3.6.2-1.fc31.x86_64"
@@ -316,7 +316,7 @@
       "evra": "0.20.1-3.fc31.x86_64"
     },
     "git-core": {
-      "evra": "2.24.1-1.fc31.x86_64"
+      "evra": "2.25.1-2.fc31.x86_64"
     },
     "glib2": {
       "evra": "2.62.5-1.fc31.x86_64"
@@ -346,25 +346,25 @@
       "evra": "3.3-3.fc31.x86_64"
     },
     "grub2-common": {
-      "evra": "1:2.02-105.fc31.noarch"
+      "evra": "1:2.02-106.fc31.noarch"
     },
     "grub2-efi-x64": {
-      "evra": "1:2.02-105.fc31.x86_64"
+      "evra": "1:2.02-106.fc31.x86_64"
     },
     "grub2-pc": {
-      "evra": "1:2.02-105.fc31.x86_64"
+      "evra": "1:2.02-106.fc31.x86_64"
     },
     "grub2-pc-modules": {
-      "evra": "1:2.02-105.fc31.noarch"
+      "evra": "1:2.02-106.fc31.noarch"
     },
     "grub2-tools": {
-      "evra": "1:2.02-105.fc31.x86_64"
+      "evra": "1:2.02-106.fc31.x86_64"
     },
     "grub2-tools-extra": {
-      "evra": "1:2.02-105.fc31.x86_64"
+      "evra": "1:2.02-106.fc31.x86_64"
     },
     "grub2-tools-minimal": {
-      "evra": "1:2.02-105.fc31.x86_64"
+      "evra": "1:2.02-106.fc31.x86_64"
     },
     "gzip": {
       "evra": "1.10-1.fc31.x86_64"
@@ -433,13 +433,13 @@
       "evra": "2.0.4-14.fc31.noarch"
     },
     "kernel": {
-      "evra": "5.5.8-200.fc31.x86_64"
+      "evra": "5.5.10-200.fc31.x86_64"
     },
     "kernel-core": {
-      "evra": "5.5.8-200.fc31.x86_64"
+      "evra": "5.5.10-200.fc31.x86_64"
     },
     "kernel-modules": {
-      "evra": "5.5.8-200.fc31.x86_64"
+      "evra": "5.5.10-200.fc31.x86_64"
     },
     "keyutils": {
       "evra": "1.6-3.fc31.x86_64"
@@ -559,7 +559,7 @@
       "evra": "1.3.5-10.fc31.x86_64"
     },
     "libldb": {
-      "evra": "2.0.8-1.fc31.x86_64"
+      "evra": "2.0.9-1.fc31.x86_64"
     },
     "libmaxminddb": {
       "evra": "1.2.0-8.fc31.x86_64"
@@ -570,8 +570,8 @@
     "libmnl": {
       "evra": "1.0.4-10.fc31.x86_64"
     },
-    "libmodulemd1": {
-      "evra": "1.8.16-1.fc31.x86_64"
+    "libmodulemd": {
+      "evra": "2.9.1-1.fc31.x86_64"
     },
     "libmount": {
       "evra": "2.34-4.fc31.x86_64"
@@ -607,7 +607,7 @@
       "evra": "0.2.1-43.fc31.x86_64"
     },
     "libpcap": {
-      "evra": "14:1.9.1-1.fc31.x86_64"
+      "evra": "14:1.9.1-2.fc31.x86_64"
     },
     "libpkgconf": {
       "evra": "1.6.3-2.fc31.x86_64"
@@ -652,7 +652,7 @@
       "evra": "2.34-4.fc31.x86_64"
     },
     "libsmbclient": {
-      "evra": "2:4.11.6-0.fc31.x86_64"
+      "evra": "2:4.11.7-0.fc31.x86_64"
     },
     "libsolv": {
       "evra": "0.7.11-1.fc31.x86_64"
@@ -721,7 +721,7 @@
       "evra": "0.3.0-8.fc31.x86_64"
     },
     "libwbclient": {
-      "evra": "2:4.11.6-0.fc31.x86_64"
+      "evra": "2:4.11.7-0.fc31.x86_64"
     },
     "libxcrypt": {
       "evra": "4.4.15-1.fc31.x86_64"
@@ -739,10 +739,10 @@
       "evra": "2.5.1-25.fc31.x86_64"
     },
     "linux-firmware": {
-      "evra": "20200122-105.fc31.noarch"
+      "evra": "20200316-106.fc31.noarch"
     },
     "linux-firmware-whence": {
-      "evra": "20200122-105.fc31.noarch"
+      "evra": "20200316-106.fc31.noarch"
     },
     "lmdb-libs": {
       "evra": "0.9.23-3.fc31.x86_64"
@@ -769,7 +769,7 @@
       "evra": "2.08-16.fc31.x86_64"
     },
     "mdadm": {
-      "evra": "4.1-1.fc31.x86_64"
+      "evra": "4.1-4.fc31.x86_64"
     },
     "microcode_ctl": {
       "evra": "2:2.1-34.fc31.x86_64"
@@ -841,10 +841,10 @@
       "evra": "1.77-3.fc31.x86_64"
     },
     "ostree": {
-      "evra": "2019.5-2.fc31.x86_64"
+      "evra": "2020.3-2.fc31.x86_64"
     },
     "ostree-libs": {
-      "evra": "2019.5-2.fc31.x86_64"
+      "evra": "2020.3-2.fc31.x86_64"
     },
     "p11-kit": {
       "evra": "0.23.20-1.fc31.x86_64"
@@ -859,7 +859,7 @@
       "evra": "0.80-7.fc31.x86_64"
     },
     "pcre": {
-      "evra": "8.43-3.fc31.x86_64"
+      "evra": "8.44-1.fc31.x86_64"
     },
     "pcre2": {
       "evra": "10.34-7.fc31.x86_64"
@@ -877,10 +877,10 @@
       "evra": "1.6.3-2.fc31.x86_64"
     },
     "podman": {
-      "evra": "2:1.8.1-0.7.rc4.fc31.x86_64"
+      "evra": "2:1.8.1-2.fc31.x86_64"
     },
     "podman-plugins": {
-      "evra": "2:1.8.1-0.7.rc4.fc31.x86_64"
+      "evra": "2:1.8.1-2.fc31.x86_64"
     },
     "policycoreutils": {
       "evra": "2.9-5.fc31.x86_64"
@@ -925,10 +925,10 @@
       "evra": "4.15.1-1.fc31.x86_64"
     },
     "rpm-ostree": {
-      "evra": "2020.1-1.fc31.x86_64"
+      "evra": "2020.1.21.ge9011530-2.fc31.x86_64"
     },
     "rpm-ostree-libs": {
-      "evra": "2020.1-1.fc31.x86_64"
+      "evra": "2020.1.21.ge9011530-2.fc31.x86_64"
     },
     "rpm-plugin-selinux": {
       "evra": "4.15.1-1.fc31.x86_64"
@@ -940,13 +940,13 @@
       "evra": "2:1.0.0-102.dev.gitdc9208a.fc31.x86_64"
     },
     "samba-client-libs": {
-      "evra": "2:4.11.6-0.fc31.x86_64"
+      "evra": "2:4.11.7-0.fc31.x86_64"
     },
     "samba-common": {
-      "evra": "2:4.11.6-0.fc31.noarch"
+      "evra": "2:4.11.7-0.fc31.noarch"
     },
     "samba-common-libs": {
-      "evra": "2:4.11.6-0.fc31.x86_64"
+      "evra": "2:4.11.7-0.fc31.x86_64"
     },
     "sed": {
       "evra": "4.5-4.fc31.x86_64"
@@ -1082,22 +1082,22 @@
     }
   },
   "metadata": {
-    "generated": "2020-03-10T22:57:04Z",
+    "generated": "2020-03-23T19:23:37Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2019-10-23T22:52:47Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2020-03-10T21:52:56Z"
+        "generated": "2020-03-20T16:24:57Z"
       },
       "fedora-modular": {
         "generated": "2019-10-23T22:53:13Z"
       },
       "fedora-updates": {
-        "generated": "2020-03-09T21:47:41Z"
+        "generated": "2020-03-23T02:27:40Z"
       },
       "fedora-updates-modular": {
-        "generated": "2020-03-06T22:30:57Z"
+        "generated": "2020-03-22T02:22:09Z"
       }
     }
   }

diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -55,9 +55,6 @@ remove-from-packages:
               /usr/lib/systemd/system/systemd-networkd-wait-online.service]
   - [systemd-container, /usr/lib/systemd/network/.*]
   - [systemd-udev, /usr/lib/systemd/network/.*]
-  # We're still using the legacy dracut network module for now. Dracut keys off
-  # of this: https://github.com/dracutdevs/dracut/blob/1fcc70fe57eea0ea658aa2de5c0044683fe85cf1/modules.d/40network/module-setup.sh#L11
-  - [NetworkManager, /usr/libexec/nm-initrd-generator]
 
 
 remove-files:

diff --git a/manifests/ignition-and-ostree.yaml b/manifests/ignition-and-ostree.yaml
@@ -8,6 +8,10 @@
 # Include rpm-ostree + kernel + bootloader
 include: bootable-rpm-ostree.yaml
 
+initramfs-args:
+  # make it a hard error if Ignition can't be included
+  - --add=ignition
+
 # Modern defaults we want
 boot-location: modules
 tmp-is-dir: true

diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.service
@@ -2,9 +2,13 @@
 Description=Ignition OSTree: Grow root filesystem
 DefaultDependencies=false
 ConditionKernelCommandLine=ostree
+# Similar to the other mount rules, suppress invocation if we detect
+# we are running from a legacy setup created by Anaconda.
+ConditionKernelCommandLine=!root
 ConditionPathExists=!/run/ostree-live
 Before=initrd-root-fs.target
 After=ignition-ostree-mount-firstboot-sysroot.service
+Requires=ignition-ostree-mount-firstboot-sysroot.service
 # This shouldn't be strictly necessary, but it's cleaner to not have OSTree muck
 # around with moving mounts while we're still resizing the filesystem.
 Before=ostree-prepare-root.service

diff --git a/...sr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service b/...sr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service
@@ -12,6 +12,10 @@ ConditionPathExists=!/run/ostree-live
 Conflicts=ignition-ostree-mount-subsequent-sysroot.service
 Before=initrd-root-fs.target
 After=ignition-disks.service
+# Note we don't have a Requires: /dev/disk/by-label/root here like
+# the -subsequent service does because ignition-disks may have
+# regenerated it.
+Requires=ignition-disks.service
 # These have an explicit dependency on After=sysroot.mount today
 Before=ostree-prepare-root.service ignition-remount-sysroot.service
 

diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh
@@ -8,6 +8,10 @@ set -euo pipefail
 # or not we've reprovisioned the rootfs, since we don't want to
 # force on prjquota there.
 rootpath=/dev/disk/by-label/root
+if ! [ -b "${rootpath}" ]; then
+  echo "ignition-ostree-mount-sysroot: Failed to find ${rootpath}" 1>&2
+  exit 1
+fi
 eval $(blkid -o export ${rootpath})
 mountflags=
 if [ "${TYPE}" == "xfs" ]; then

diff --git a/overlay.d/05core/usr/lib/systemd/system/emergency.service.d/coreos-sulogin-force.conf b/overlay.d/05core/usr/lib/systemd/system/emergency.service.d/coreos-sulogin-force.conf
@@ -0,0 +1,7 @@
+# https://github.com/coreos/coreos-installer/commit/15a79263d0bd5d72056a6080f6687dc10cba2dda
+# https://github.com/systemd/systemd/pull/10397
+# We want things like `systemd.unit=emergency.target` and `single` on the 
+# kernel command line to just work even with our locked root account.
+# This file is used as an override for both emergency.target and rescue.target.
+[Service]
+Environment=SYSTEMD_SULOGIN_FORCE=1
diff --git a/overlay.d/05core/usr/lib/systemd/system/rescue.service.d/coreos-sulogin-force.conf b/overlay.d/05core/usr/lib/systemd/system/rescue.service.d/coreos-sulogin-force.conf
@@ -0,0 +1 @@
+../emergency.service.d/coreos-sulogin-force.conf