diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service deleted file mode 100644 index 8180072d72..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Ignition (disks) -DefaultDependencies=false - -Requires=local-fs-pre.target -Before=local-fs-pre.target - -# setup networking -Wants=systemd-networkd.service -After=systemd-networkd.service - -# generate resolv.conf -Wants=systemd-resolved.service -After=systemd-resolved.service - -# prevent racing with sgdisk and its subsequent udev activity -After=disk-uuid.service - -[Service] -Type=oneshot -EnvironmentFile=/run/ignition.env -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service deleted file mode 100644 index 1405bf9aec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=Ignition (files) -DefaultDependencies=false -Before=initrd-parse-etc.service - -Requires=initrd-root-fs.target -After=initrd-root-fs.target - -Requires=ignition-disks.service -After=ignition-disks.service - -# setup the root filesystem before we try do things like create users on it. -Requires=initrd-setup-root.service -After=initrd-setup-root.service - -# setup networking -Wants=systemd-networkd.service -After=systemd-networkd.service - -# generate resolv.conf -Wants=systemd-resolved.service -After=systemd-resolved.service - -[Service] -Type=oneshot -EnvironmentFile=/run/ignition.env -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target deleted file mode 100644 index 305a8a74a6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -DefaultDependencies=false -Before=initrd-switch-root.target - -OnFailure=emergency.target -OnFailureJobMode=replace-irreversibly - -Requires=ignition-disks.service -After=ignition-disks.service - -Requires=ignition-files.service -After=ignition-files.service diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.12.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.12.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.12.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.12.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 1cf9b323a2..7dea6308bb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -31,8 +31,4 @@ src_compile() { src_install() { newbin ${GOBIN}/internal ${PN} - - systemd_dounit "${FILESDIR}"/ignition.target - systemd_dounit "${FILESDIR}"/ignition-disks.service - systemd_dounit "${FILESDIR}"/ignition-files.service } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.9-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.9-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 15dc9b3a7a..09217ac95b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="797d0610fb66b67f2b375f6b61f0ac5c21fe30ea" + CROS_WORKON_COMMIT="00323315b0fee43cfc9c4f5eeea77d9f523473ea" KEYWORDS="amd64 arm arm64 x86" fi