From 74fe7d4cb8641e0f42459e05973fb1afc5b46650 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 15 Oct 2021 01:36:02 +0200 Subject: [PATCH] Make AppArmor independent of Supervisor service (#1592) Currently the hassos-apparmor.service wants the hassos-supervisor.service and vice-versa. This is unnecessary and leads to activation of hassos-supervisor.service when reload/restart hassos-apparmor.service (Supervisor is doing that on startup). Make hassos-apparmor.service independent and add dependency as well as ordering from hassos-supervisor.service side. --- .../usr/lib/systemd/system/hassos-apparmor.service | 4 ++-- .../usr/lib/systemd/system/hassos-supervisor.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service index d5fb0b467..a187b789c 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-apparmor.service @@ -1,8 +1,8 @@ [Unit] Description=HassOS AppArmor -Wants=hassos-supervisor.service network-online.target time-sync.target +Wants=network-online.target time-sync.target After=network-online.target time-sync.target -Before=docker.service hassos-supervisor.service +Before=docker.service RequiresMountsFor=/mnt/data [Service] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service index 98fe3e1be..3ebf6ff6f 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service @@ -2,7 +2,7 @@ Description=HassOS supervisor Requires=docker.service rauc.service dbus.service Wants=network-online.target hassos-apparmor.service time-sync.target -After=docker.service rauc.service dbus.service network-online.target time-sync.target +After=docker.service rauc.service dbus.service network-online.target hassos-apparmor.service time-sync.target RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay StartLimitIntervalSec=60 StartLimitBurst=5