From 16ce227d79f12a080dc29cde537af748325fbda1 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 3 Jun 2013 15:23:21 -0400 Subject: [PATCH 1/3] fix(coreos-init): start splitting startup into multiple units This is the first round of splitting up the coreos_startup script into multiple units, starting with using systemd to mount the state and oem partitions. This lets us use systemd to get device dependencies right. Also cleanup whitespace, I forgot ebuild style requires tab characters. Sync up -9999 version which I missed in previous commits. --- ...-r5.ebuild => coreos-init-0.0.1-r6.ebuild} | 0 .../coreos-init/coreos-init-0.0.1.ebuild | 25 +++++++++++-------- .../coreos-init/coreos-init-9999.ebuild | 21 ++++++++++------ 3 files changed, 28 insertions(+), 18 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r5.ebuild => coreos-init-0.0.1-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index cea2c6d6c1..5e96f070ea 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="9b03ebb14f931b132963088a11dd41d7425e7b2f" +CROS_WORKON_COMMIT="0935d44747e8b336a2e85db02adb589bb75d399e" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" @@ -20,21 +20,24 @@ IUSE="nfs" DEPEND="" RDEPEND=" - sys-block/parted - sys-apps/gptfdisk - sys-apps/systemd - " + sys-block/parted + sys-apps/gptfdisk + sys-apps/systemd + " src_install() { - into / # We want /sbin, not /usr/sbin, etc. + # Install our boot scripts along side systemd in /usr/lib + exeinto /usr/lib/coreos + for script in scripts/*; do + doexe "${script}" + done - dosbin coreos_startup + # Install all units, enable the higher-level services + for unit in systemd/*; do + systemd_dounit "${unit}" + done - systemd_dounit coreos-startup.service systemd_enable_service basic.target coreos-startup.service - - systemd_dounit update-engine.service systemd_enable_service multi-user.target update-engine.service - systemd_enable_service multi-user.target sshd.socket } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 1d73344884..803af03fc9 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -18,18 +18,25 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="nfs" DEPEND="" -RDEPEND="sys-apps/systemd" +RDEPEND=" + sys-block/parted + sys-apps/gptfdisk + sys-apps/systemd + " src_install() { - into / # We want /sbin, not /usr/sbin, etc. + # Install our boot scripts along side systemd in /usr/lib + exeinto /usr/lib/coreos + for script in scripts/*; do + doexe "${script}" + done - dosbin coreos_startup + # Install all units, enable the higher-level services + for unit in systemd/*; do + systemd_dounit "${unit}" + done - systemd_dounit coreos-startup.service systemd_enable_service basic.target coreos-startup.service - - systemd_dounit update-engine.service systemd_enable_service multi-user.target update-engine.service - systemd_enable_service multi-user.target sshd.socket } From 7754ca21317dec53e3ad3955f31196d41cf0a935 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 3 Jun 2013 16:33:25 -0400 Subject: [PATCH 2/3] fix(coreos-base/coreos-base): remove /var/run from fstab No longer needed as systemd is installed with a unit to bind /var/run to /run which is always a tmpfs mount. Binding the two seems cleaner. --- .../{coreos-base-0-r55.ebuild => coreos-base-0-r56.ebuild} | 0 .../coreos-overlay/coreos-base/coreos-base/files/fstab | 1 - 2 files changed, 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r55.ebuild => coreos-base-0-r56.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r55.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r56.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r55.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r56.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/fstab b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/fstab index 26c4504cf3..7bd4223f82 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/fstab +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/fstab @@ -13,4 +13,3 @@ # /dev/ROOT / ext3 defaults 0 0 -tmpfs /var/run tmpfs defaults 0 0 From c30049ef68b20d532e84de45bdd2bcdec31522d8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 3 Jun 2013 16:58:24 -0400 Subject: [PATCH 3/3] fix(coreos-init): code fix for new path to coreos_startup --- .../coreos-base/coreos-init/coreos-init-0.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index 5e96f070ea..bd72c543f0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="0935d44747e8b336a2e85db02adb589bb75d399e" +CROS_WORKON_COMMIT="ad419999ea478bb60867e9e14f01197b928a5c73" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init"