[gnome-initial-setup/benzea/systemd-3-36: 132/134] data: Run copy worker as early as possible on systemd

[Benjamin Berg <bberg src gnome org>]

commit 3847e518371800325fe0859e14fe0acd18df6ade
Author: Benjamin Berg <bberg redhat com>
Date:   Fri Mar 27 11:23:25 2020 +0100

    data: Run copy worker as early as possible on systemd
    
    Move the copy worker to be part of basic.target so that it is run before
    the user session is even started. i.e. after this change the copy worker
    will be launched when the systemd user instance is started by
    pam_systemd. It will therefore happen for any login and not just if
    GNOME is selected as a desktop environment.

 data/gnome-initial-setup-copy-worker.service.in | 8 +++-----
 data/meson.build                                | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/data/gnome-initial-setup-copy-worker.service.in b/data/gnome-initial-setup-copy-worker.service.in
index b3840bba..693fd5e2 100644
--- a/data/gnome-initial-setup-copy-worker.service.in
+++ b/data/gnome-initial-setup-copy-worker.service.in
@@ -1,11 +1,9 @@
 [Unit]
 Description=GNOME Initial Setup Copy Worker
+DefaultDependencies=no
 
-# Make sure we run really early
-Before=gnome-session-pre.target graphical-session-pre.target
-
-# Never run in GDM
-Conflicts=gnome-session@gnome-login.target
+# Make sure we run before anything else can
+Before=basic.target
 
 ConditionPathExists=!%E/gnome-initial-setup-done
 
diff --git a/data/meson.build b/data/meson.build
index 19e3643b..1f3eef39 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -45,7 +45,7 @@ if enable_systemd
     unit_files = {
         'gnome-initial-setup.service' : [ 'gnome-session@gnome-initial-setup.target.wants/' ],
         'gnome-initial-setup-first-login.service' : [ 'gnome-session.target.wants/' ],
-        'gnome-initial-setup-copy-worker.service' : [ 'gnome-session.target.wants/' ],
+        'gnome-initial-setup-copy-worker.service' : [ 'basic.target.wants/' ],
         'gnome-welcome-tour.service' : [ 'gnome-session.target.wants/' ],
     }