InitSystem: better systemd version detection

CarterLi · CarterLi · commit 1863bde91664 · 2024-05-30T08:45:14.000+08:00
diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c
@@ -20,7 +20,7 @@ const char* ffDetectInitSystem(FFInitSystemResult* result)
     if (ffStrbufEqualS(&result->name, "systemd"))
     {
         if (ffProcessAppendStdOut(&result->version, (char* const[]) {
-            result->exe.chars, // use exe path in case users have another systemd installed
+            ffStrbufEndsWithS(&result->exe, "/systemd") ? result->exe.chars : "systemctl", // use exe path in case users have another systemd installed
             "--version",
             NULL,
         }) == NULL && result->version.length)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const char* ffDetectInitSystem(FFInitSystemResult* result)`
`20`	`20`	`if (ffStrbufEqualS(&result->name, "systemd"))`
`21`	`21`	`{`
`22`	`22`	`if (ffProcessAppendStdOut(&result->version, (char* const[]) {`
`23`		`- result->exe.chars, // use exe path in case users have another systemd installed`
	`23`	`+ ffStrbufEndsWithS(&result->exe, "/systemd") ? result->exe.chars : "systemctl", // use exe path in case users have another systemd installed`
`24`	`24`	`"--version",`
`25`	`25`	`NULL,`
`26`	`26`	`}) == NULL && result->version.length)`