From 472161f3688d8b2bf14d0ef0d3c2585e4ac0f40d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 30 Oct 2025 22:21:46 +0100 Subject: [PATCH] userdb: Add missing .membership extension to membership files Follow up for fe0342edf4693ac14c8cb9a977afa09e4acd4daf This also drops the mkosi testuser from the wheel and systemd-journal groups as the integration tests rely on the testuser not being to read the full journal. --- mkosi/mkosi.credentials/userdb.user.testuser | 4 ---- src/userdb/userdbctl.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mkosi/mkosi.credentials/userdb.user.testuser b/mkosi/mkosi.credentials/userdb.user.testuser index 6a2ce883241..69a1bfd21da 100644 --- a/mkosi/mkosi.credentials/userdb.user.testuser +++ b/mkosi/mkosi.credentials/userdb.user.testuser @@ -3,10 +3,6 @@ "uid": 4711, "disposition": "regular", "enforcePasswordPolicy": false, - "memberOf": [ - "wheel", - "systemd-journal" - ], "shell": "/bin/bash", "privileged": { "hashedPassword": ["$1$kqp7NF1f$tNnQcshPX53CSfRKTQD0R1"] diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index 8efdc7c1336..ca698e7345f 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -1430,7 +1430,7 @@ static int load_credential_one( if (ur) STRV_FOREACH(g, ur->member_of) { - _cleanup_free_ char *membership = strjoin(ur->user_name, ":", *g); + _cleanup_free_ char *membership = strjoin(ur->user_name, ":", *g, ".membership"); if (!membership) return log_oom(); @@ -1442,7 +1442,7 @@ static int load_credential_one( } else STRV_FOREACH(u, gr->members) { - _cleanup_free_ char *membership = strjoin(*u, ":", gr->group_name); + _cleanup_free_ char *membership = strjoin(*u, ":", gr->group_name, ".membership"); if (!membership) return log_oom(); -- 2.47.3