[gnome-shell/benzea/systemd-3.36-units: 1/2] data: Use org.gnome.Shell prefix for systemd units
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/benzea/systemd-3.36-units: 1/2] data: Use org.gnome.Shell prefix for systemd units
- Date: Thu, 13 Feb 2020 19:43:16 +0000 (UTC)
commit af666d87e38bd6d039da3d3e36f5e7df4f5ae717
Author: Benjamin Berg <bberg redhat com>
Date: Thu Feb 13 18:39:32 2020 +0100
data: Use org.gnome.Shell prefix for systemd units
In general we want to move towards using reverse domain names for
systemd units. Doing this also means we have a consistent name between
desktop file and systemd unit, allowing us to create a generator that
pulls in the unit as defined in the sessions RequiredComponents.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895
data/meson.build | 14 +++++++-------
....service => org.gnome.Shell-disable-extensions.service} | 0
...yland.service.in => org.gnome.Shell-wayland.service.in} | 2 +-
...shell-wayland.target => org.gnome.Shell-wayland.target} | 4 ++--
...shell-x11.service.in => org.gnome.Shell-x11.service.in} | 2 +-
.../{gnome-shell-x11.target => org.gnome.Shell-x11.target} | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 87b52ce542..c41805c9b9 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -101,22 +101,22 @@ if have_systemd
unitconf.set('bindir', bindir)
configure_file(
- input: 'gnome-shell-x11.service.in',
- output: 'gnome-shell-x11.service',
+ input: 'org.gnome.Shell-x11.service.in',
+ output: 'org.gnome.Shell-x11.service',
configuration: unitconf,
install_dir: systemduserunitdir
)
configure_file(
- input: 'gnome-shell-wayland.service.in',
- output: 'gnome-shell-wayland.service',
+ input: 'org.gnome.Shell-wayland.service.in',
+ output: 'org.gnome.Shell-wayland.service',
configuration: unitconf,
install_dir: systemduserunitdir
)
- units = files('gnome-shell-x11.target',
- 'gnome-shell-wayland.target',
- 'gnome-shell-disable-extensions.service')
+ units = files('org.gnome.Shell-x11.target',
+ 'org.gnome.Shell-wayland.target',
+ 'org.gnome.Shell-disable-extensions.service')
install_data(units, install_dir: systemduserunitdir)
endif
diff --git a/data/gnome-shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service
similarity index 100%
rename from data/gnome-shell-disable-extensions.service
rename to data/org.gnome.Shell-disable-extensions.service
diff --git a/data/gnome-shell-wayland.service.in b/data/org.gnome.Shell-wayland.service.in
similarity index 89%
rename from data/gnome-shell-wayland.service.in
rename to data/org.gnome.Shell-wayland.service.in
index 04f94af2d6..903749187a 100644
--- a/data/gnome-shell-wayland.service.in
+++ b/data/org.gnome.Shell-wayland.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=GNOME Shell on Wayland
# On wayland, force a session shutdown
-OnFailure=gnome-shell-disable-extensions.service gnome-session-shutdown.target
+OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-shutdown.target
OnFailureJobMode=replace-irreversibly
CollectMode=inactive-or-failed
RefuseManualStart=on
diff --git a/data/gnome-shell-wayland.target b/data/org.gnome.Shell-wayland.target
similarity index 70%
rename from data/gnome-shell-wayland.target
rename to data/org.gnome.Shell-wayland.target
index 37e1966d99..2cb2c2e60e 100644
--- a/data/gnome-shell-wayland.target
+++ b/data/org.gnome.Shell-wayland.target
@@ -6,5 +6,5 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target
-Requires=gnome-shell-wayland.service
-After=gnome-shell-wayland.service
+Requires=org.gnome.Shell-wayland.service
+After=org.gnome.Shell-wayland.service
diff --git a/data/gnome-shell-x11.service.in b/data/org.gnome.Shell-x11.service.in
similarity index 91%
rename from data/gnome-shell-x11.service.in
rename to data/org.gnome.Shell-x11.service.in
index a10c33d29d..5e85f486c2 100644
--- a/data/gnome-shell-x11.service.in
+++ b/data/org.gnome.Shell-x11.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=GNOME Shell on X11
# On X11, try to show the GNOME Session Failed screen
-OnFailure=gnome-shell-disable-extensions.service gnome-session-failed.target
+OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-failed.target
OnFailureJobMode=replace
CollectMode=inactive-or-failed
RefuseManualStart=on
diff --git a/data/gnome-shell-x11.target b/data/org.gnome.Shell-x11.target
similarity index 72%
rename from data/gnome-shell-x11.target
rename to data/org.gnome.Shell-x11.target
index f4af2c8ddf..02d61822b0 100644
--- a/data/gnome-shell-x11.target
+++ b/data/org.gnome.Shell-x11.target
@@ -6,5 +6,5 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target
-Requires=gnome-shell-x11.service
-After=gnome-shell-x11.service
+Requires=org.gnome.Shell-x11.service
+After=org.gnome.Shell-x11.service
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]