From 3cb59f734fd85210442d25788e89e9a648e72b84 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 21 Sep 2015 14:05:55 -0700 Subject: [PATCH] sys-apps/ignition: remove timeouts We can rely on the built-in Ignition timeouts instead. This will allow individual OEMs to define specific timeouts. The default online-timeout is one minute, so there is no change in behavior. --- .../sys-apps/ignition/files/ignition-disks.service | 3 +-- .../sys-apps/ignition/files/ignition-files.service | 3 +-- .../{ignition-0.1.6-r1.ebuild => ignition-0.1.6-r2.ebuild} | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.6-r1.ebuild => ignition-0.1.6-r2.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 c6dde68da9..917ed3f933 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,6 @@ After=disk-uuid.service [Service] Type=oneshot -TimeoutStartSec=2m Environment=OEM_ID=pxe EnvironmentFile=-/mnt/oem/oem-release -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks --online-timeout=1m +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 index 2b6c97e4a4..1833e5777e 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 @@ -26,7 +26,6 @@ After=initrd-systemd-resolved.service [Service] Type=oneshot -TimeoutStartSec=30s Environment=OEM_ID=pxe EnvironmentFile=-/mnt/oem/oem-release -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files --online-timeout=1m +ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.6-r2.ebuild