From 56749f5da25c32806f599d846b1e7efdfb625c08 Mon Sep 17 00:00:00 2001 From: Matheson Steplock Date: Tue, 7 Sep 2021 01:44:16 +0000 Subject: [PATCH] fixes --- homeassistant-supervised.deb | Bin 4200 -> 4272 bytes homeassistant-supervised/DEBIAN/postinst | 3 +++ .../systemd/system/hassio-apparmor.service | 0 .../systemd/system/hassio-supervisor.service | 0 .../hassio/apparmor => sbin}/hassio-apparmor | 0 .../share/hassio/apparmor/hassio-supervisor | 0 6 files changed, 3 insertions(+) rename homeassistant-supervised/{ => etc}/systemd/system/hassio-apparmor.service (100%) rename homeassistant-supervised/{ => etc}/systemd/system/hassio-supervisor.service (100%) rename homeassistant-supervised/usr/{share/hassio/apparmor => sbin}/hassio-apparmor (100%) create mode 100644 homeassistant-supervised/usr/share/hassio/apparmor/hassio-supervisor diff --git a/homeassistant-supervised.deb b/homeassistant-supervised.deb index 004632c6e268901ee71813f6c38c47d07a68448e..ae132d66b372cd9c8c380d430f37a75477401e74 100644 GIT binary patch delta 4092 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 diff --git a/homeassistant-supervised/DEBIAN/postinst b/homeassistant-supervised/DEBIAN/postinst index 461b636..a7dae2f 100755 --- a/homeassistant-supervised/DEBIAN/postinst +++ b/homeassistant-supervised/DEBIAN/postinst @@ -15,6 +15,8 @@ SERVICE_NM="NetworkManager.service" # Read infos from web URL_VERSION="https://version.home-assistant.io/stable.json" HASSIO_VERSION=$(curl -s $URL_VERSION | jq -e -r '.supervisor') +URL_APPARMOR_PROFILE="https://version.home-assistant.io/apparmor.txt" + # Restart NetworkManager info "Restarting NetworkManager" @@ -85,6 +87,7 @@ systemctl enable hassio-supervisor.service > /dev/null 2>&1; # Install AppArmor info "Install AppArmor scripts" +curl -sL ${URL_APPARMOR_PROFILE} > "${DATA_SHARE}/apparmor/hassio-supervisor" sed -i "s,%%HASSIO_CONFIG%%,${CONFIG},g" "${PREFIX}/sbin/hassio-apparmor" sed -i -e "s,%%SERVICE_DOCKER%%,${SERVICE_DOCKER},g" \ -e "s,%%HASSIO_APPARMOR_BINARY%%,${PREFIX}/sbin/hassio-apparmor,g" \ diff --git a/homeassistant-supervised/systemd/system/hassio-apparmor.service b/homeassistant-supervised/etc/systemd/system/hassio-apparmor.service similarity index 100% rename from homeassistant-supervised/systemd/system/hassio-apparmor.service rename to homeassistant-supervised/etc/systemd/system/hassio-apparmor.service diff --git a/homeassistant-supervised/systemd/system/hassio-supervisor.service b/homeassistant-supervised/etc/systemd/system/hassio-supervisor.service similarity index 100% rename from homeassistant-supervised/systemd/system/hassio-supervisor.service rename to homeassistant-supervised/etc/systemd/system/hassio-supervisor.service diff --git a/homeassistant-supervised/usr/share/hassio/apparmor/hassio-apparmor b/homeassistant-supervised/usr/sbin/hassio-apparmor similarity index 100% rename from homeassistant-supervised/usr/share/hassio/apparmor/hassio-apparmor rename to homeassistant-supervised/usr/sbin/hassio-apparmor diff --git a/homeassistant-supervised/usr/share/hassio/apparmor/hassio-supervisor b/homeassistant-supervised/usr/share/hassio/apparmor/hassio-supervisor new file mode 100644 index 0000000..e69de29