From 3d43b4f8e1d2c65b1bb421f44b9dfefcb11b2e57 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 2 Jun 2015 12:06:38 -0700 Subject: [PATCH] sys-apps/ignition: remove stages --- .../sys-apps/ignition/files/ignition-prepivot.target | 3 --- .../files/{ignition@.service => ignition.service} | 2 +- .../sys-apps/ignition/ignition-9999.ebuild | 9 +++------ 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-prepivot.target rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{ignition@.service => ignition.service} (80%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-prepivot.target b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-prepivot.target deleted file mode 100644 index e0cb68512f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-prepivot.target +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Requires=ignition@prepivot.service -After=ignition@prepivot.service diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition@.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.service similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition@.service rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.service index dc557a89c6..92611521c0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition@.service +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.service @@ -10,7 +10,7 @@ Type=oneshot RemainAfterExit=yes Environment=OEM_NAME=pxe EnvironmentFile=-/usr/share/oem/environment -ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_NAME} --stage=%i +ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_NAME} [Install] WantedBy=initrd.target 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 41c6befb71..74e4e5633c 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 @@ -24,14 +24,11 @@ src_compile() { } src_install() { - dobin ${GOBIN}/* + newbin ${GOBIN}/src ignition systemd_dounit "${FILESDIR}"/coreos-metadata.target - - systemd_dounit "${FILESDIR}"/ignition@.service - systemd_dounit "${FILESDIR}"/ignition-prepivot.target - - systemd_enable_service initrd.target ignition-prepivot.target + systemd_dounit "${FILESDIR}"/ignition.service + systemd_enable_service initrd.target ignition.service coreos-dodoc -r doc/* }