Source: sddm
Severity: important
Tags: patch

Hi,

while looking into #792400, I noticed that sddm uses a hard-coded path
to /usr/bin/systemctl for the HALT and REBOOT command in CMakeLists.txt.
In Debian we still have a split-usr setup and systemctl is installed as
/bin/systemctl. The attached patch replaces that path in CMakeLists.txt.

A patch for upstream might detect the path automatically similar to what
AC_PATH_PROG does for autoconf.

Regards,
Michael

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.0.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf3fb70..e0306dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,8 +112,8 @@ if(SYSTEMD_FOUND)
     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
     string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
     set(MINIMUM_VT 7)
-    set(HALT_COMMAND "/usr/bin/systemctl poweroff")
-    set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
+    set(HALT_COMMAND "/bin/systemctl poweroff")
+    set(REBOOT_COMMAND "/bin/systemctl reboot")
 else()
     set(SYSTEMD_FOUND 0)
     set(MINIMUM_VT 7)

Reply via email to