Skip to content

refactor: add seatd systemd override #24

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

Merged
justforlxz merged 1 commit into from
Dec 5, 2024
Merged

refactor: add seatd systemd override #24

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
2 changes: 2 additions & 0 deletions data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ install(FILES
WORLD_READ WORLD_EXECUTE
)

add_subdirectory(systemd)

if(BUILD_MAN_PAGES)
add_subdirectory(man)
endif()
7 changes: 7 additions & 0 deletions data/systemd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
if (NOT DEFINED SYSTEMD_SYSTEM_UNIT_DIR)
find_package(PkgConfig REQUIRED)
pkg_check_modules(Systemd REQUIRED systemd)
pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemduserunitdir)
endif()

install(FILES override.conf DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/seatd.service.d/)
4 changes: 4 additions & 0 deletions data/systemd/override.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Service]
Environment=SEATD_VTBOUND=0
ExecStart=
ExecStart=seatd -u dde -g dde -l debug
3 changes: 3 additions & 0 deletions services/ddm.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ PartOf=graphical.target
StartLimitIntervalSec=30
StartLimitBurst=2

Requires=seatd.service
Before=seatd.service

[Service]
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/ddm
Restart=always
Expand Down
17 changes: 0 additions & 17 deletions src/daemon/SingleWaylandDisplayServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,13 @@ SingleWaylandDisplayServer::SingleWaylandDisplayServer(SocketServer *socketServe
, m_socketServer(socketServer)
, m_helper(new QProcess(this))
{
QProcess *m_seatd = new QProcess(this);
m_seatd->setProgram("seatd");
m_seatd->setArguments({"-u", "dde", "-g", "dde", "-l", "debug"});
m_seatd->setProcessEnvironment([] {
auto env = QProcessEnvironment::systemEnvironment();
env.insert("SEATD_VTBOUND", "0");
return env;
}());
connect(m_seatd, &QProcess::readyReadStandardOutput, this, [m_seatd] {
qInfo() << m_seatd->readAllStandardOutput();
});
connect(m_seatd, &QProcess::readyReadStandardError, this, [m_seatd] {
qWarning() << m_seatd->readAllStandardError();
});

connect(m_helper, &QProcess::readyReadStandardOutput, this, [this] {
qInfo() << m_helper->readAllStandardOutput();
});
connect(m_helper, &QProcess::readyReadStandardError, this, [this] {
qWarning() << m_helper->readAllStandardError();
});

m_seatd->start();

QString socketName = QStringLiteral("treeland-helper-%1").arg(generateName(6));

// log message
Expand Down
Loading