From b67b5cc48c418415eb3233f78ab089bc447b1952 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 9 Sep 2019 22:38:44 +0100 Subject: [PATCH] data: Disable g-i-s service in GDM gnome-initial-setup should never run in GDM, add a conflict to prevent this from happening. --- data/gnome-initial-setup-copy-worker.service.in | 3 +++ data/gnome-initial-setup-first-login.service.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/data/gnome-initial-setup-copy-worker.service.in b/data/gnome-initial-setup-copy-worker.service.in index 9b411d0..b7627d0 100644 --- a/data/gnome-initial-setup-copy-worker.service.in +++ b/data/gnome-initial-setup-copy-worker.service.in @@ -4,6 +4,9 @@ Description=GNOME Initial Setup Copy Worker # 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 + ConditionPathExists=!%E/gnome-initial-setup-done [Service] diff --git a/data/gnome-initial-setup-first-login.service.in b/data/gnome-initial-setup-first-login.service.in index 302753b..940395a 100644 --- a/data/gnome-initial-setup-first-login.service.in +++ b/data/gnome-initial-setup-first-login.service.in @@ -7,6 +7,9 @@ After=gnome-session.target # Together with Type=oneshot, make sure the welcome tour starts after setup Before=gnome-welcome-tour.service +# Never run in GDM +Conflicts=gnome-session@gnome-login.target + Conflicts=gnome-session@gnome-initial-setup.target ConditionPathExists=!%E/gnome-initial-setup-done -- 2.21.0