Skip to content

fix: avoid mistakenly create seat group on debian-based systems #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
calsys456 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: avoid mistakenly create seat group on debian-based systems #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions services/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
configure_file(ddm.service.in ddm.service)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ddm.service" DESTINATION "${SYSTEMD_SYSTEM_UNIT_DIR}")

configure_file(ddm-sysuser.conf.in ddm-sysuser.conf)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ddm-sysuser.conf" DESTINATION "${SYSTEMD_SYSUSERS_DIR}" RENAME dde.conf)

# systemd-tmpfiles can be used standalone without other systemd parts
if(DEFINED SYSTEMD_TMPFILES_DIR)
configure_file(ddm-tmpfiles.conf.in ddm-tmpfiles.conf)
Expand All @@ -12,6 +9,14 @@ endif()

if(EXISTS "/etc/debian_version")
install(FILES debian.ddm.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME ddm)

# In debian-based systems, seatd uses video group instead of seat
# group, avoid creating seat group mistakenly by specifying
# different sysuser.conf
configure_file(debian.ddm-sysuser.conf.in debian.ddm-sysuser.conf)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/debian.ddm-sysuser.conf" DESTINATION "${SYSTEMD_SYSUSERS_DIR}" RENAME dde.conf)
else()
install(FILES ddm.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME ddm)
configure_file(ddm-sysuser.conf.in ddm-sysuser.conf)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ddm-sysuser.conf" DESTINATION "${SYSTEMD_SYSUSERS_DIR}" RENAME dde.conf)
endif()
6 changes: 6 additions & 0 deletions services/debian.ddm-sysuser.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Type Name ID GECOS Home directory Shell
u dde - "DDM Greeter Account" ${STATE_DIR} -
g dde -
m dde dde
m dde video
m dde render