From ae0aeb84f513d877e402d38bd547555bd67f0b22 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 8 Apr 2021 20:22:19 +0200 Subject: [PATCH] Update to OS Agent 1.0.0 (#1317) * Update to OS Agent 1.0.0 * Use new D-Bus path/interface/object in haos-wipe.service --- buildroot-external/package/os-agent/os-agent.mk | 7 ++++--- .../usr/lib/systemd/system/haos-wipe.service | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/buildroot-external/package/os-agent/os-agent.mk b/buildroot-external/package/os-agent/os-agent.mk index 9c3ccf5ca..f532a2dcb 100644 --- a/buildroot-external/package/os-agent/os-agent.mk +++ b/buildroot-external/package/os-agent/os-agent.mk @@ -4,15 +4,16 @@ # ################################################################################ -OS_AGENT_VERSION = 8ce70291d410b2d32bac5057e1ada70e8c49bf12 +OS_AGENT_VERSION = 1.0.0 OS_AGENT_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION)) OS_AGENT_LICENSE = Apache License 2.0 OS_AGENT_LICENSE_FILES = LICENSE OS_AGENT_GOMOD = github.com/home-assistant/os-agent +OS_AGENT_LDFLAGS = -X main.version=$(OS_AGENT_VERSION) define OS_AGENT_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/contrib/io.homeassistant.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/io.homeassistant.conf + $(INSTALL) -D -m 0644 $(@D)/contrib/io.hass.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/io.hass.conf $(INSTALL) -D -m 0644 $(@D)/contrib/haos-agent.service \ $(TARGET_DIR)/usr/lib/systemd/system/haos-agent.service endef diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-wipe.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-wipe.service index 670ac6256..8df2b5647 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-wipe.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-wipe.service @@ -11,7 +11,7 @@ ConditionKernelCommandLine=haos.wipe=1 [Service] Type=oneshot -ExecStart=/usr/bin/busctl --verbose --timeout=1h call io.homeassistant.os /io/homeassistant/os/System io.homeassistant.os.System WipeDevice +ExecStart=/usr/bin/busctl --verbose --timeout=1h call io.hass.os /io/hass/os/System io.hass.os.System WipeDevice ExecStartPost=/usr/bin/sed -i 's/\s*haos.wipe=1//g' /mnt/boot/cmdline.txt [Install]