From dac4630cd56e43bef01409ad0beb93cf7a7ce5f2 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 31 Aug 2015 19:26:54 -0700 Subject: [PATCH] sys-apps/ignition: remove udev trigger On first boot, GRUB will add coreos.first_boot=1 to the kernel parameters. A generator will then add Ignition as a dependency. --- .../coreos-overlay/sys-apps/ignition/files/90-ignition.rules | 1 - .../{ignition-0.1.2-r2.ebuild => ignition-0.1.2-r3.ebuild} | 2 -- .../{ignition-0.1.5.ebuild => ignition-0.1.5-r1.ebuild} | 0 .../coreos-overlay/sys-apps/ignition/ignition-9999.ebuild | 2 -- 4 files changed, 5 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/90-ignition.rules rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.2-r2.ebuild => ignition-0.1.2-r3.ebuild} (95%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.5.ebuild => ignition-0.1.5-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/90-ignition.rules b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/90-ignition.rules deleted file mode 100644 index bf3c1ab1de..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/90-ignition.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_PART_TABLE_UUID}=="00000000-0000-0000-0000-000000000001", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ignition.target" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r3.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r3.ebuild index 7fb414663c..c85e3c9e29 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r3.ebuild @@ -30,8 +30,6 @@ src_compile() { src_install() { newbin ${GOBIN}/src ${PN} - udev_dorules "${FILESDIR}"/90-ignition.rules - systemd_dounit "${FILESDIR}"/mnt-oem.mount systemd_dounit "${FILESDIR}"/ignition.target systemd_dounit "${FILESDIR}"/ignition-disks.service diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.5-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.5-r1.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 41cf667501..8f3d3f21e6 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 @@ -31,8 +31,6 @@ src_compile() { src_install() { newbin ${GOBIN}/src ${PN} - udev_dorules "${FILESDIR}"/90-ignition.rules - systemd_dounit "${FILESDIR}"/mnt-oem.mount systemd_dounit "${FILESDIR}"/ignition.target systemd_dounit "${FILESDIR}"/ignition-disks.service