From e1a26d28ba9b20cf896117d27ac933cfe085cbd5 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 17 Jul 2015 18:05:50 -0700 Subject: [PATCH] sys-apps/ignition: update EnvironmentFile --- .../sys-apps/ignition/files/ignition-disks.service | 6 +++--- .../sys-apps/ignition/files/ignition-files.service | 6 +++--- .../{ignition-0.1.0.ebuild => ignition-0.1.0-r1.ebuild} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.0.ebuild => ignition-0.1.0-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 d8679fc424..f31a38db13 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 @@ -13,7 +13,7 @@ After=mnt-oem.mount [Service] Type=oneshot TimeoutStartSec=30s -Environment=OEM_NAME=pxe +Environment=OEM_ID=pxe Environment=FETCH_TIMEOUT=1m -EnvironmentFile=-/mnt/oem/environment -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_NAME} --stage=disks --fetchtimeout=${FETCH_TIMEOUT} +EnvironmentFile=-/mnt/oem/oem-release +ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks --fetchtimeout=${FETCH_TIMEOUT} 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 fb85828759..fec8fed282 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 @@ -13,7 +13,7 @@ After=mnt-oem.mount [Service] Type=oneshot TimeoutStartSec=30s -Environment=OEM_NAME=pxe +Environment=OEM_ID=pxe Environment=FETCH_TIMEOUT=1m -EnvironmentFile=-/mnt/oem/environment -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_NAME} --stage=files --fetchtimeout=${FETCH_TIMEOUT} +EnvironmentFile=-/mnt/oem/oem-release +ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files --fetchtimeout=${FETCH_TIMEOUT} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.0-r1.ebuild