From 2ffe5d15a595cf115c106e9eb88dbc38353ce76a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 9 Sep 2015 20:28:51 -0700 Subject: [PATCH] sys-apps/ignition: fix timeout flags --- .../sys-apps/ignition/files/ignition-disks.service | 3 +-- .../sys-apps/ignition/files/ignition-files.service | 3 +-- .../{ignition-0.1.6.ebuild => ignition-0.1.6-r1.ebuild} | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.6.ebuild => ignition-0.1.6-r1.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 6907c05324..c6dde68da9 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 @@ -23,6 +23,5 @@ After=disk-uuid.service Type=oneshot TimeoutStartSec=2m Environment=OEM_ID=pxe -Environment=FETCH_TIMEOUT=1m EnvironmentFile=-/mnt/oem/oem-release -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks --fetchtimeout=${FETCH_TIMEOUT} +ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks --online-timeout=1m 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 index e806d1a890..2b6c97e4a4 100644 --- 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 @@ -28,6 +28,5 @@ After=initrd-systemd-resolved.service Type=oneshot TimeoutStartSec=30s Environment=OEM_ID=pxe -Environment=FETCH_TIMEOUT=1m EnvironmentFile=-/mnt/oem/oem-release -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files --fetchtimeout=${FETCH_TIMEOUT} +ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files --online-timeout=1m diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6-r1.ebuild