From 1e070a8240ad64db950c7f0cd18eb75160449020 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 18 Oct 2022 08:49:49 +0200 Subject: [PATCH] More systemd user --session changes --- .../user/basic.target.wants/systemd-tmpfiles-setup.service | 1 + .../mycroft/.config/systemd/user/dbus-org.bluez.obex.service | 1 + .../user/gui.target.wants/mycroft-enclosure-gui.service | 1 - .../.config/systemd/user/gui.target.wants/mycroft-gui.service | 1 - .../user/timers.target.wants/systemd-tmpfiles-clean.timer | 1 + .../usr/lib/systemd/user/mycroft-enclosure-gui.service | 3 ++- .../rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service | 4 +--- 7 files changed, 6 insertions(+), 6 deletions(-) create mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service create mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/dbus-org.bluez.obex.service delete mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-enclosure-gui.service delete mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-gui.service create mode 120000 buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service new file mode 120000 index 00000000..b5d0d3dc --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service @@ -0,0 +1 @@ +../../../../../../usr/lib/systemd/user/systemd-tmpfiles-setup.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/dbus-org.bluez.obex.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/dbus-org.bluez.obex.service new file mode 120000 index 00000000..cef97607 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/dbus-org.bluez.obex.service @@ -0,0 +1 @@ +../../../../../usr/lib/systemd/user/obex.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-enclosure-gui.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-enclosure-gui.service deleted file mode 120000 index 82f52b11..00000000 --- a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-enclosure-gui.service +++ /dev/null @@ -1 +0,0 @@ -../../../../../../usr/lib/systemd/user/mycroft-enclosure-gui.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-gui.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-gui.service deleted file mode 120000 index 3e375eda..00000000 --- a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-gui.service +++ /dev/null @@ -1 +0,0 @@ -../../../../../../usr/lib/systemd/user/mycroft-gui.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer new file mode 120000 index 00000000..73d432a7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer @@ -0,0 +1 @@ +../../../../../../usr/lib/systemd/user/systemd-tmpfiles-clean.timer \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service index 6e51fcba..27d83013 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service @@ -1,5 +1,6 @@ [Unit] Description=Mycroft Enclosure +PartOf=mycroft.service After=mycroft.service After=mycroft-messagebus.service @@ -17,4 +18,4 @@ StartLimitBurst=4 #WatchdogSec=30s [Install] -WantedBy=gui.target +WantedBy=mycroft.service diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service index 28b63aac..1c923afc 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service @@ -1,7 +1,5 @@ [Unit] Description=Mycroft GUI -After=mycroft-enclosure-gui.service -Requires=mycroft-enclosure-gui.service [Service] ExecStartPre=-/usr/bin/kbuildsycoca5 @@ -10,4 +8,4 @@ StandardOutput=null Restart=on-failure [Install] -WantedBy=gui.target +WantedBy=mycroft.service