[gnome-shell/benzea/systemd-3.36-units: 1/2] data: Add an abstract gnome-shell.target

[Benjamin Berg <bberg src gnome org>]

commit 94b9c0610488b0b560d896cf9d772cb8fa24a3b9
Author: Benjamin Berg <bberg redhat com>
Date:   Tue Dec 10 16:23:43 2019 +0100

    data: Add an abstract gnome-shell.target
    
    Add a gnome-shell.target to simplify pulling in the GNOME shell into the
    ssession.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895

 data/gnome-shell-wayland.target |  6 ++++++
 data/gnome-shell-x11.target     |  6 ++++++
 data/gnome-shell.target         | 18 ++++++++++++++++++
 data/meson.build                |  3 ++-
 4 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/data/gnome-shell-wayland.target b/data/gnome-shell-wayland.target
index 37e1966d99..831cf33a7b 100644
--- a/data/gnome-shell-wayland.target
+++ b/data/gnome-shell-wayland.target
@@ -1,6 +1,12 @@
 [Unit]
 Description=GNOME Shell on Wayland
 DefaultDependencies=no
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+# Only allow this target to be loaded in a wayland session
+Requisite=gnome-session-wayland.target
 
 Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
diff --git a/data/gnome-shell-x11.target b/data/gnome-shell-x11.target
index f4af2c8ddf..ed71a771c7 100644
--- a/data/gnome-shell-x11.target
+++ b/data/gnome-shell-x11.target
@@ -1,6 +1,12 @@
 [Unit]
 Description=GNOME Shell on X11
 DefaultDependencies=no
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+# Only allow this target to be loaded in a X11 session
+Requisite=gnome-session-x11.target
 
 Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
diff --git a/data/gnome-shell.target b/data/gnome-shell.target
new file mode 100644
index 0000000000..771685375b
--- /dev/null
+++ b/data/gnome-shell.target
@@ -0,0 +1,18 @@
+[Unit]
+Description=GNOME Shell
+DefaultDependencies=no
+CollectMode=inactive-or-failed
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# Pull in both x11 and wayland, one of them will fail due to dependencies.
+Wants=gnome-shell-wayland.target
+Wants=gnome-shell-x11.target
+
+PartOf=gnome-shell-wayland.target
+PartOf=gnome-shell-x11.target
+
+After=gnome-shell-wayland.target
+After=gnome-shell-x11.target
diff --git a/data/meson.build b/data/meson.build
index 88a61765f5..62337e6197 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -114,7 +114,8 @@ if have_systemd
     install_dir: systemduserunitdir
   )
 
-  units = files('gnome-shell-x11.target',
+  units = files('gnome-shell.target',
+                'gnome-shell-x11.target',
                 'gnome-shell-wayland.target',
                 'gnome-shell-disable-extensions.service')