From 128a70c4903860452d67745c98d299cddd875ed5 Mon Sep 17 00:00:00 2001 From: Yutao Meng Date: Sat, 12 Oct 2024 15:30:23 +0800 Subject: [PATCH] chore: Change user unit orders Bug: https://pms.uniontech.com/bug-view-271617.html Log: Signed-off-by: Yutao Meng --- debian/changelog | 7 +++++++ systemd/CMakeLists.txt | 4 ++-- .../dde-session@x11.service | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) rename systemd/{dde-session-pre.target.wants => dde-session-initialized.target.wants}/dde-session@x11.service (90%) diff --git a/debian/changelog b/debian/changelog index 82300e4..867fc9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dde-session (1.2.14) UNRELEASED; urgency=medium + + * chore: Remove dde-shell@DDE.service's dependency on dde-session-daemon (#91) + * chore: Change user unit orders + + -- Yutao Meng Sat, 12 Oct 2024 15:54:13 +0800 + dde-session (1.2.13) unstable; urgency=medium * chore: 解决修改快捷键配置重启后恢复的问题 diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 2a1986a..5c4beb7 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -22,7 +22,6 @@ install(FILES ${SERVICES} DESTINATION lib/systemd/user/) install(DIRECTORY DESTINATION lib/systemd/user/dde-session-pre.target.wants/) set(DDE_SESSION_PRE_WANTS - dde-session-pre.target.wants/dde-session@x11.service dde-session-pre.target.wants/dde-display.service ) @@ -30,6 +29,7 @@ set(DDE_SESSION_PRE_WANTS install(DIRECTORY DESTINATION lib/systemd/user/dde-session-initialized.target.wants/) set(DDE_SESSION_INITIALIZED_WANTS dde-session-initialized.target.wants/dde-desktop.service + dde-session-initialized.target.wants/dde-session@x11.service dde-session-initialized.target.wants/dde-shell@DDE.service dde-session-initialized.target.wants/dde-lock.service dde-session-initialized.target.wants/dde-osd.service @@ -39,9 +39,9 @@ set(DDE_SESSION_INITIALIZED_WANTS install(FILES ${DDE_SESSION_PRE_WANTS} DESTINATION lib/systemd/user/) install(FILES ${DDE_SESSION_INITIALIZED_WANTS} DESTINATION lib/systemd/user/) -install_symlink(dde-session@x11.service dde-session-pre.target.wants) install_symlink(dde-display.service dde-session-pre.target.wants) install_symlink(dde-desktop.service dde-session-initialized.target.wants) +install_symlink(dde-session@x11.service dde-session-initialized.target.wants) install_symlink(dde-shell@DDE.service dde-session-initialized.target.wants) install_symlink(dde-lock.service dde-session-initialized.target.wants) install_symlink(dde-polkit-agent.service dde-session-initialized.target.wants) diff --git a/systemd/dde-session-pre.target.wants/dde-session@x11.service b/systemd/dde-session-initialized.target.wants/dde-session@x11.service similarity index 90% rename from systemd/dde-session-pre.target.wants/dde-session@x11.service rename to systemd/dde-session-initialized.target.wants/dde-session@x11.service index 2da1be4..ab937e1 100644 --- a/systemd/dde-session-pre.target.wants/dde-session@x11.service +++ b/systemd/dde-session-initialized.target.wants/dde-session@x11.service @@ -5,9 +5,9 @@ OnFailure=dde-session-shutdown.target OnFailureJobMode=replace CollectMode=inactive-or-failed -Requisite=dde-session-pre.target -PartOf=dde-session-pre.target -Before=dde-session-pre.target +Requisite=dde-session-initialized.target +PartOf=dde-session-initialized.target +Before=dde-session-initialized.target # Limit startup frequency more than the default StartLimitIntervalSec=15s