brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data: Use org.gnome.Shell prefix for systemd units

Browse Source 
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
This commit is contained in:
Benjamin Berg 2020-02-13 18:39:32 +01:00 committed by Benjamin Berg
parent 2b0731ab81
commit 4c9f42eea9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/meson.build
View File

@ -101,22 +101,22 @@ if have_systemd
unitconf.set('bindir', bindir) unitconf.set('bindir', bindir)
configure_file( configure_file(
input: 'gnome-shell-x11.service.in', input: 'org.gnome.Shell-x11.service.in',
output: 'gnome-shell-x11.service', output: 'org.gnome.Shell-x11.service',
configuration: unitconf, configuration: unitconf,
install_dir: systemduserunitdir install_dir: systemduserunitdir
) )
configure_file( configure_file(
input: 'gnome-shell-wayland.service.in', input: 'org.gnome.Shell-wayland.service.in',
output: 'gnome-shell-wayland.service', output: 'org.gnome.Shell-wayland.service',
configuration: unitconf, configuration: unitconf,
install_dir: systemduserunitdir install_dir: systemduserunitdir
) )
units = files('gnome-shell-x11.target', units = files('org.gnome.Shell-x11.target',
'gnome-shell-wayland.target', 'org.gnome.Shell-wayland.target',
'gnome-shell-disable-extensions.service') 'org.gnome.Shell-disable-extensions.service')
install_data(units, install_dir: systemduserunitdir) install_data(units, install_dir: systemduserunitdir)
endif endif

0
data/gnome-shell-disable-extensions.service → data/org.gnome.Shell-disable-extensions.service
View File

2
data/gnome-shell-wayland.service.in → data/org.gnome.Shell-wayland.service.in
View File

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=GNOME Shell on Wayland Description=GNOME Shell on Wayland
# On wayland, force a session shutdown # 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 OnFailureJobMode=replace-irreversibly
CollectMode=inactive-or-failed CollectMode=inactive-or-failed
RefuseManualStart=on RefuseManualStart=on

4
data/gnome-shell-wayland.target → data/org.gnome.Shell-wayland.target
View File

@ -6,5 +6,5 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target Before=gnome-session-initialized.target
Requires=gnome-shell-wayland.service Requires=org.gnome.Shell-wayland.service
After=gnome-shell-wayland.service After=org.gnome.Shell-wayland.service

2
data/gnome-shell-x11.service.in → data/org.gnome.Shell-x11.service.in
View File

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=GNOME Shell on X11 Description=GNOME Shell on X11
# On X11, try to show the GNOME Session Failed screen # 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 OnFailureJobMode=replace
CollectMode=inactive-or-failed CollectMode=inactive-or-failed
RefuseManualStart=on RefuseManualStart=on

4
data/gnome-shell-x11.target → data/org.gnome.Shell-x11.target
View File

@ -6,5 +6,5 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target Before=gnome-session-initialized.target
Requires=gnome-shell-x11.service Requires=org.gnome.Shell-x11.service
After=gnome-shell-x11.service After=org.gnome.Shell-x11.service