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
This commit is contained in:
Stefan Agner 2021-04-08 20:22:19 +02:00 committed by GitHub
parent c9d091c1b3
commit ae0aeb84f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -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_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION))
OS_AGENT_LICENSE = Apache License 2.0 OS_AGENT_LICENSE = Apache License 2.0
OS_AGENT_LICENSE_FILES = LICENSE OS_AGENT_LICENSE_FILES = LICENSE
OS_AGENT_GOMOD = github.com/home-assistant/os-agent OS_AGENT_GOMOD = github.com/home-assistant/os-agent
OS_AGENT_LDFLAGS = -X main.version=$(OS_AGENT_VERSION)
define OS_AGENT_INSTALL_INIT_SYSTEMD define OS_AGENT_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/contrib/io.homeassistant.conf \ $(INSTALL) -D -m 0644 $(@D)/contrib/io.hass.conf \
$(TARGET_DIR)/etc/dbus-1/system.d/io.homeassistant.conf $(TARGET_DIR)/etc/dbus-1/system.d/io.hass.conf
$(INSTALL) -D -m 0644 $(@D)/contrib/haos-agent.service \ $(INSTALL) -D -m 0644 $(@D)/contrib/haos-agent.service \
$(TARGET_DIR)/usr/lib/systemd/system/haos-agent.service $(TARGET_DIR)/usr/lib/systemd/system/haos-agent.service
endef endef

View File

@ -11,7 +11,7 @@ ConditionKernelCommandLine=haos.wipe=1
[Service] [Service]
Type=oneshot 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 ExecStartPost=/usr/bin/sed -i 's/\s*haos.wipe=1//g' /mnt/boot/cmdline.txt
[Install] [Install]