From 7e877dc5e44f0bd94672414286ac71896ecaeb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Tue, 10 Nov 2020 19:44:44 +0900 Subject: [PATCH] coreos-base/coreos-(cloud)init: Point to flatcar-master Pulls in https://github.com/flatcar-linux/coreos-cloudinit/pull/10 https://github.com/flatcar-linux/init/pull/30 to restore the systemd-networkd 243 behavior with KeepConfiguration=dhcp-on-stop to prevent the network from going down before the SIGTERM is broadcasted to orphaned processes not part of a systemd unit. --- .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index ea363a20db..d2c4381527 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -11,7 +11,7 @@ inherit cros-workon systemd toolchain-funcs udev coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="8911fe016d69f67bfc61f36f59ca083a604f7109" # flatcar-master + CROS_WORKON_COMMIT="cfcc44197d11f44441e5aa2c9db34bcd0bf16015" # flatcar-master KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index ab3699594d..847d0d143e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-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="e56e0c1f2174598c03ffedb26a8530849beef664" # flatcar-master + CROS_WORKON_COMMIT="365cfc7b128dfe0244ec20b4a006964f29633754" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi