-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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) | ||
|
|
@@ -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 | ||
sourcery-ai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 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) | ||
|
Comment on lines
10
to
+17
|
||
| 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() | ||
| 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} - | ||
|
Comment on lines
+1
to
+2
|
||
| g dde - | ||
| m dde dde | ||
| m dde video | ||
| m dde render | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
不应该这样做,应该添加一个cmake参数,在debian/rules 打包时关闭这些能力,而且要在readme里说明。不过这个提交不用改,可以新起一个。