blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: duplicate systemd service

Browse Source 
Use Dbus type service, and place it in the app.slice
This commit is contained in:
Zhang Dingyuan 2023-04-24 15:44:57 +08:00
parent d18daaab59
commit 0ffe1d4b2d
No known key found for this signature in database
GPG Key ID: A9BEDA8810262215
5 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/CMakeLists.txt
View File

@ -1,3 +1,2 @@
add_subdirectory(systemd)
add_subdirectory(dconf)
add_subdirectory(service)

16
misc/service/CMakeLists.txt
View File

@ -1,16 +0,0 @@
set(SERVICE_FILES
dde-application-manager.service
)
macro(install_symlink filepath wantsdir)
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/link/${wantsdir}/)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/lib/systemd/user/${filepath} ${PROJECT_BINARY_DIR}/link/${wantsdir}/${filepath})
install(FILES ${PROJECT_BINARY_DIR}/link/${wantsdir}/${filepath} DESTINATION lib/systemd/user/${wantsdir}/)
endmacro(install_symlink)
# 安装service文件到用户service目录
install(FILES ${SERVICE_FILES} DESTINATION lib/systemd/user/)
# 创建软链接
install_symlink(dde-application-manager.service dde-session-daemon.target.wants)

26
misc/service/dde-application-manager.service
View File

@ -1,26 +0,0 @@
[Unit]
Description=DDE application manager service
RefuseManualStart=no
RefuseManualStop=no
#OnFailure=dde-session-shutdown.target
OnFailureJobMode=replace-irreversibly
CollectMode=inactive-or-failed
StartLimitIntervalSec=10s
StartLimitBurst=30
Requisite=dde-session-manager.target
After=dde-session-manager.target
Requisite=dde-display.target
After=dde-display.target
BindsTo=dde-session-daemon.service
Before=dde-session-daemon.service
[Service]
Type=simple
ExecStart=/usr/bin/dde-application-manager
TimeoutStartSec=infinity
Slice=components.slice
Restart=on-failure
RestartSec=300ms

2
misc/systemd/org.deepin.dde.Application1.Instance@.service
View File

@ -6,4 +6,4 @@ Type=simple
Environment="DAM_TASK_HASH=%I"
Environment="DAM_TASK_TYPE=freedesktop"
ExecStart=/usr/bin/dde-application-loader
Slice=applications.slice
Slice=app.slice

12
misc/systemd/org.deepin.dde.Application1.Manager.service
View File

@ -1,8 +1,16 @@
[Unit]
Description=DDE Application Manager service
RefuseManualStart=no
RefuseManualStop=no
OnFailureJobMode=replace-irreversibly
CollectMode=inactive-or-failed
StartLimitIntervalSec=10s
StartLimitBurst=30
[Service]
Type=DBus
Type=dbus
BusName=org.deepin.dde.Application1.Manager
ExecStart=/usr/bin/dde-application-manager
Slice=services.slice
Slice=app.slice
Restart=on-failure
RestartSec=300ms