From 66d877f32db07c468841b49f2580422c6b1c2d67 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 28 Mar 2014 13:45:48 -0700 Subject: [PATCH 1/3] bump(coreos-base/update_engine): Source path reorg. All of the helper script services and systemd files are included in the update_engine repository now. The pxe service now uses the more generic 'stub' name. Fix install path for dbus config. Remove useless udev rule. --- .../update-engine-reboot-manager.service | 7 ----- .../update_engine/files/update-engine.service | 17 ------------ .../files/update_engine_reboot_manager | 23 ---------------- ...ebuild => update_engine-0.0.1-r386.ebuild} | 0 .../update_engine/update_engine-9999.ebuild | 26 +++++++------------ 5 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service delete mode 100755 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update_engine_reboot_manager rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r385.ebuild => update_engine-0.0.1-r386.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service deleted file mode 100644 index ae661d7b1f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -PartOf=update-engine.service -Description=Update Engine Reboot Manager - -[Service] -ExecStart=/usr/sbin/update_engine_reboot_manager -Restart=always diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service deleted file mode 100644 index 81f65ef70a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Update Engine -ConditionVirtualization=!container -ConditionKernelCommandLine=!coreos.diskless -ConditionKernelCommandLine=!coreos.statediskonly -Wants=update-engine-reboot-manager.service - -[Service] -Type=dbus -BusName=org.chromium.UpdateEngine -ExecStart=/usr/sbin/update_engine -foreground -logtostderr -no_connection_manager -BlockIOWeight=100 -Restart=always -RestartSec=30 - -[Install] -WantedBy=default.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update_engine_reboot_manager b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update_engine_reboot_manager deleted file mode 100755 index ebb793e7ee..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update_engine_reboot_manager +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2013 The CoreOS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# TODO: Make this a service in Go that coordinates between a host group - -interface=org.chromium.UpdateEngineInterface -member=StatusUpdate - -reboot_tasks() { - sync - echo "$0 rebooting machine after update" > /dev/kmsg - shutdown -r -t 60 -} - -filter="type=signal,interface='$interface',member='$member'" - -dbus-monitor --system ${filter} | -while read -r line; do - echo $line | grep -q "UPDATE_STATUS_UPDATED_NEED_REBOOT" && reboot_tasks -done diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r385.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r386.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r385.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r386.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 27130fa786..7706dc3a8d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="dba8a748e1da4d0bb85d2a0232b101906da80ae5" + CROS_WORKON_COMMIT="f084f56dec6aeb1259e901112f3b9461e265883f" KEYWORDS="amd64 arm x86" fi @@ -80,11 +80,9 @@ src_test() { } src_install() { - dosbin "${FILESDIR}"/update_engine_reboot_manager - systemd_dounit "${FILESDIR}"/update-engine-reboot-manager.service - systemd_enable_service multi-user.target update-engine-reboot-manager.service - dosbin update_engine + dosbin systemd/update_engine_reboot_manager + dosbin systemd/update_engine_stub dobin update_engine_client dosbin coreos-postinst @@ -97,26 +95,20 @@ src_install() { use delta_generator && dobin delta_generator - systemd_dounit "${FILESDIR}"/update-engine.service + systemd_dounit systemd/update-engine.service + systemd_dounit systemd/update-engine-reboot-manager.service + systemd_dounit systemd/update-engine-stub.service + systemd_dounit systemd/update-engine-stub.timer systemd_enable_service multi-user.target update-engine.service + systemd_enable_service multi-user.target update-engine-stub.timer insinto /usr/share/dbus-1/services doins org.chromium.UpdateEngine.service - insinto /etc/dbus-1/system.d + insinto /usr/share/dbus-1/system.d doins UpdateEngine.conf - insinto /lib/udev/rules.d - doins 99-gpio-dutflag.rules - insinto /usr/include/chromeos/update_engine doins update_engine.dbusserver.h doins update_engine.dbusclient.h - - # PXE - exeinto /usr/lib/coreos/ - doexe "${S}"/pxe/pxe_update_engine - systemd_dounit "${S}"/pxe/pxe-update-engine.service - systemd_dounit "${S}"/pxe/pxe-update-engine.timer - systemd_enable_service default.target pxe-update-engine.timer } From 1b8331db604353c6cede637fd9c22f19234443c0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 28 Mar 2014 15:03:37 -0700 Subject: [PATCH 2/3] feat(coreos-base/coreos-cloudinit): Create generic template. Replace coreos-cloudinit-oem.service by a generic service template that can be used for any path. Add rule to load cloud-configs installed by the coreos-install utility. --- ...-r1.ebuild => coreos-cloudinit-0.3.2-r2.ebuild} | 0 .../coreos-cloudinit/coreos-cloudinit-9999.ebuild | 3 +-- .../coreos-cloudinit/files/cloud-config.target | 7 +++++-- .../files/coreos-cloudinit-oem.service | 14 -------------- .../files/coreos-cloudinit@.service | 13 +++++++++++++ 5 files changed, 19 insertions(+), 18 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-0.3.2-r1.ebuild => coreos-cloudinit-0.3.2-r2.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.3.2-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index 5dbfd97356..bd8027d41f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -36,8 +36,7 @@ src_compile() { src_install() { dobin ${S}/bin/coreos-cloudinit - systemd_dounit "${FILESDIR}"/coreos-cloudinit-oem.service + systemd_dounit "${FILESDIR}"/coreos-cloudinit@.service systemd_dounit "${FILESDIR}"/cloud-config.target - systemd_enable_service default.target coreos-cloudinit-oem.service systemd_enable_service default.target cloud-config.target } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target index 71901cafd1..97029e1a36 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target @@ -1,6 +1,9 @@ [Unit] -Requires=coreos-cloudinit-oem.service -After=coreos-cloudinit-oem.service +# Load OEM and coreos-install cloud-configs by default +Requires=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service +After=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service +Requires=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service +After=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service [Install] WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service deleted file mode 100644 index 0c8c42b74c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=coreos-cloudinit for /usr/share/oem/cloud-config.yml -Requires=dbus.service -After=dbus.service -RequiresMountsFor=/usr/share/oem -ConditionPathExists=/usr/share/oem/cloud-config.yml - -[Service] -Type=oneshot -ExecStart=/usr/bin/coreos-cloudinit --from-file=/usr/share/oem/cloud-config.yml - -[Install] -WantedBy=multi-user.target -WantedBy=cloudinit.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service new file mode 100644 index 0000000000..1051bdb063 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Load cloud-config from %f +Requires=dbus.service +After=dbus.service +RequiresMountsFor=%f +ConditionFileNotEmpty=%f + +[Service] +Type=oneshot +ExecStart=/usr/bin/coreos-cloudinit --from-file=%f + +[Install] +WantedBy=cloud-config.target From e4292c240efa72b3962d678bd347e57719ccca49 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 31 Mar 2014 14:47:46 -0700 Subject: [PATCH 3/3] bump(coreos-base/coreos-init): Update coreos-install script. --- ...oreos-init-0.0.1-r70.ebuild => coreos-init-0.0.1-r71.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r70.ebuild => coreos-init-0.0.1-r71.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r70.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r70.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r71.ebuild 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 ef2c3db80f..060ab9a75c 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 @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="79c21da232a77b1b323eb165e73bb448e8bc5241" + CROS_WORKON_COMMIT="907417baab1a0701168ae4d5be8b5da456e719f2" KEYWORDS="amd64 arm x86" fi