From a28e55579b6315a918cea54c33f3553c6a62a882 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 28 Aug 2015 16:29:37 -0700 Subject: [PATCH] sys-apps/ignition: fix network timeout issues The HTTP client timeout has been lowered to 10 seconds, while the service timeout has been increased to 2 minutes. This will give Ignition more opportunities to retry the fetch. --- .../sys-apps/ignition/files/ignition-disks.service | 2 +- .../{ignition-0.1.5-r1.ebuild => ignition-0.1.6.ebuild} | 0 .../coreos-overlay/sys-apps/ignition/ignition-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.5-r1.ebuild => ignition-0.1.6.ebuild} (100%) 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 index 4adb076449..6907c05324 100644 --- 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 @@ -21,7 +21,7 @@ After=disk-uuid.service [Service] Type=oneshot -TimeoutStartSec=30s +TimeoutStartSec=2m Environment=OEM_ID=pxe Environment=FETCH_TIMEOUT=1m EnvironmentFile=-/mnt/oem/oem-release diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.5-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6.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 8f3d3f21e6..8097e729a7 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 @@ -11,7 +11,7 @@ inherit coreos-doc coreos-go cros-workon systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="c365e09a489c02566ebd331b804d77b25c23e0d6" # tag v0.1.5 + CROS_WORKON_COMMIT="7a54f33ddc92e9a3b775790be8cddf7a0f74961e" # tag v0.1.6 KEYWORDS="amd64 arm64" fi