From dc93d4a5f30cf1e693635d0a7b8135b974218ea9 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Wed, 26 Oct 2022 11:59:54 +0200
Subject: [PATCH] Try to fix the whole systemd screw-up
---
.../rootfs-overlay/etc/systemd/system/default.target | 2 +-
.../kdeconnectd.service | 0
.../mycroft.service | 0
.../shairport-sync.service | 0
.../spotifyd.service | 0
.../usr/lib/systemd/system/{gui.target => ovos.target} | 2 +-
6 files changed, 2 insertions(+), 2 deletions(-)
rename buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/{multi-user.target.wants => default.target.wants}/kdeconnectd.service (100%)
rename buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/{multi-user.target.wants => default.target.wants}/mycroft.service (100%)
rename buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/{multi-user.target.wants => default.target.wants}/shairport-sync.service (100%)
rename buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/{multi-user.target.wants => default.target.wants}/spotifyd.service (100%)
rename buildroot-external/rootfs-overlay/usr/lib/systemd/system/{gui.target => ovos.target} (72%)
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/default.target b/buildroot-external/rootfs-overlay/etc/systemd/system/default.target
index 61256a99..670edd0e 120000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/default.target
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/default.target
@@ -1 +1 @@
-../../../usr/lib/systemd/system/gui.target
\ No newline at end of file
+../../../usr/lib/systemd/system/ovos.target
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/kdeconnectd.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/kdeconnectd.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/kdeconnectd.service
rename to buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/kdeconnectd.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/mycroft.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/mycroft.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/mycroft.service
rename to buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/mycroft.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/shairport-sync.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/shairport-sync.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/shairport-sync.service
rename to buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/shairport-sync.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/spotifyd.service b/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/spotifyd.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/multi-user.target.wants/spotifyd.service
rename to buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/spotifyd.service
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/gui.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos.target
similarity index 72%
rename from buildroot-external/rootfs-overlay/usr/lib/systemd/system/gui.target
rename to buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos.target
index e8931a36..beee30b4 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/gui.target
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos.target
@@ -4,5 +4,5 @@ Documentation=man:systemd.special(7)
Requires=multi-user.target
Wants=mycroft-gui.service
Conflicts=rescue.service rescue.target
-After=multi-user.target rescue.service rescue.target display-manager.service
+After=multi-user.target rescue.service rescue.target
AllowIsolate=yes