chore: move dde-session@x11 to dde-session-pre.target

debian/changelog

@@ -1,3 +1,9 @@
+dde-session (1.2.9) unstable; urgency=medium
+
+  * chore: move dde-session@x11 to dde-session-pre.target
+
+ -- justforlxz <zhangdingyuan@deepin.org>  Sun, 28 Apr 2024 13:03:06 +0800
+
 dde-session (1.2.8) unstable; urgency=medium
 
   * fix: logging out takes a long time

systemd/CMakeLists.txt

@@ -17,13 +17,12 @@ set(SERVICES
     ${CMAKE_CURRENT_BINARY_DIR}/dde-session-shutdown.service
     dde-session-shutdown.target
     dde-session.target
-    dde-session@x11.service
-    dde-session@wayland.service
 )
 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
 )
 
@@ -40,6 +39,7 @@ 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-shell@DDE.service dde-session-initialized.target.wants)

systemd/dde-session-pre.target.wants/dde-display.service

@@ -11,14 +11,15 @@ Requires=dbus.socket
 After=dbus.socket
 
 Requisite=dde-session-pre.target
+PartOf=dde-session-pre.target
 Before=dde-session-pre.target
 
-After=dde-session@wayland.service
 Before=dde-session@x11.service
 
 [Service]
 Type=notify
 NotifyAccess=all
+ExecCondition=/bin/sh -c 'test "$DISPLAY" != "" || exit 2'
 ExecStart=/usr/bin/startdde
 TimeoutStartSec=infinity
 Slice=session.slice

systemd/dde-session@x11.service → systemd/dde-session-pre.target.wants/dde-session@x11.service

@@ -4,26 +4,18 @@ Description=dde on X11
 OnFailure=dde-session-shutdown.target
 OnFailureJobMode=replace
 CollectMode=inactive-or-failed
-RefuseManualStart=on
-RefuseManualStop=on
-
-Requires=dde-session-manager.service
-After=dde-session-manager.service
 
 Requisite=dde-session-pre.target
 PartOf=dde-session-pre.target
-After=dde-session-pre.target
-
-PartOf=graphical-session.target
+Before=dde-session-pre.target
 
 # Limit startup frequency more than the default
 StartLimitIntervalSec=15s
 StartLimitBurst=3
 
 [Service]
 Slice=session.slice
-BusName=org.kde.KWin
-Type=dbus
+Type=notify
 # NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
 #       the [Unit] section with systemd >= 246. Also, the current solution is
 #       kind of painful as systemd had a bug where it retries the condition.

systemd/dde-session.target

@@ -10,6 +10,3 @@ After=dde-session-initialized.target
 
 Requires=dde-session-manager.service
 After=dde-session-manager.service
-
-Wants=dde-session@wayland.service
-Wants=dde-session@x11.service