646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
24 lines
937 B
Diff
24 lines
937 B
Diff
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
|
|
index 31e94384..2c297551 100644
|
|
--- a/session-helper/flatpak-session-helper.c
|
|
+++ b/session-helper/flatpak-session-helper.c
|
|
@@ -698,7 +698,7 @@ start_p11_kit_server (const char *flatpak_dir)
|
|
g_auto(GStrv) stdout_lines = NULL;
|
|
int i;
|
|
const char * const p11_argv[] = {
|
|
- "p11-kit", "server",
|
|
+ "@p11kit@", "server",
|
|
/* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
|
|
* this flag. This is good, because those earlier versions did not properly daemonize and caused
|
|
* the spawn_sync to hang forever, waiting for the pipe to close.
|
|
@@ -852,8 +852,7 @@ main (int argc,
|
|
exit (1);
|
|
}
|
|
|
|
- pk11_program = g_find_program_in_path ("p11-kit");
|
|
- if (pk11_program)
|
|
+ if (TRUE)
|
|
start_p11_kit_server (flatpak_dir);
|
|
else
|
|
g_info ("p11-kit not found");
|