Skip to content

Commit c5cfe7c

Browse files
calsys456zccrs
authored andcommitted
fix: avoid mistakenly create seat group on debian-based systems
seatd uses video group instead of seat group on debian-based systems, so we need a specified version of sysuser.conf to avoid creating seat group mistakenly.
1 parent ddfd1fa commit c5cfe7c

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

services/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
configure_file(ddm.service.in ddm.service)
22
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ddm.service" DESTINATION "${SYSTEMD_SYSTEM_UNIT_DIR}")
33

4-
configure_file(ddm-sysuser.conf.in ddm-sysuser.conf)
5-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ddm-sysuser.conf" DESTINATION "${SYSTEMD_SYSUSERS_DIR}" RENAME dde.conf)
6-
74
# systemd-tmpfiles can be used standalone without other systemd parts
85
if(DEFINED SYSTEMD_TMPFILES_DIR)
96
configure_file(ddm-tmpfiles.conf.in ddm-tmpfiles.conf)
@@ -12,6 +9,14 @@ endif()
129

1310
if(EXISTS "/etc/debian_version")
1411
install(FILES debian.ddm.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME ddm)
12+
13+
# In debian-based systems, seatd uses video group instead of seat
14+
# group, avoid creating seat group mistakenly by specifying
15+
# different sysuser.conf
16+
configure_file(debian.ddm-sysuser.conf.in debian.ddm-sysuser.conf)
17+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/debian.ddm-sysuser.conf" DESTINATION "${SYSTEMD_SYSUSERS_DIR}" RENAME dde.conf)
1518
else()
1619
install(FILES ddm.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME ddm)
20+
configure_file(ddm-sysuser.conf.in ddm-sysuser.conf)
21+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ddm-sysuser.conf" DESTINATION "${SYSTEMD_SYSUSERS_DIR}" RENAME dde.conf)
1722
endif()
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Type Name ID GECOS Home directory Shell
2+
u dde - "DDM Greeter Account" ${STATE_DIR} -
3+
g dde -
4+
m dde dde
5+
m dde video
6+
m dde render

0 commit comments

Comments
 (0)