mirror of
https://github.com/LizardByte/Sunshine.git
synced 2026-08-07 18:36:34 +00:00
fix(linux/xdgportal): allow unified systemd service for all capture methods (#4854)
This commit is contained in:
@@ -1,4 +0,0 @@
|
||||
# @PROJECT_DESCRIPTION@
|
||||
# The unprivileged service should preset to disabled
|
||||
|
||||
disable app-@PROJECT_FQDN@.service
|
||||
@@ -2,7 +2,6 @@
|
||||
Description=@PROJECT_DESCRIPTION@
|
||||
StartLimitIntervalSec=500
|
||||
StartLimitBurst=5
|
||||
Conflicts=sunshine.service
|
||||
After=graphical-session.target xdg-desktop-autostart.target xdg-desktop-portal.service
|
||||
|
||||
[Service]
|
||||
@@ -12,7 +11,7 @@ ExecStartPre=/bin/sleep 5
|
||||
@SUNSHINE_SERVICE_STOP_COMMAND@
|
||||
Restart=on-failure
|
||||
RestartSec=5s
|
||||
NoNewPrivileges=true
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical-session.target
|
||||
Alias=sunshine.service
|
||||
|
||||
@@ -390,9 +390,8 @@ fi
|
||||
%caps(cap_sys_admin+p) %{_bindir}/sunshine
|
||||
%caps(cap_sys_admin+p) %{_bindir}/sunshine-*
|
||||
|
||||
# Systemd unit/preset files for user services
|
||||
# Systemd unit files for user services
|
||||
%{_userunitdir}/*.service
|
||||
%{_userpresetdir}/*.preset
|
||||
|
||||
# Udev rules
|
||||
%{_udevrulesdir}/*-sunshine.rules
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
[Unit]
|
||||
Description=@PROJECT_DESCRIPTION@
|
||||
StartLimitIntervalSec=500
|
||||
StartLimitBurst=5
|
||||
Conflicts=app-@PROJECT_FQDN@.service
|
||||
After=graphical-session.target xdg-desktop-autostart.target
|
||||
|
||||
[Service]
|
||||
# Avoid starting Sunshine before the desktop is fully initialized.
|
||||
ExecStartPre=/bin/sleep 5
|
||||
@SUNSHINE_SERVICE_START_COMMAND@
|
||||
@SUNSHINE_SERVICE_STOP_COMMAND@
|
||||
Restart=on-failure
|
||||
RestartSec=5s
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical-session.target
|
||||
Reference in New Issue
Block a user