From b8505e5d898b05817795297cdb5941fb3399a212 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 14 Feb 2022 16:26:51 +0100 Subject: [PATCH] profiles: Override UIDs and GIDs where we differ grom Gentoo These mostly are UIDs and GIDs that we have allocated before we picked up changes from Gentoo. --- .../coreos/targets/generic/make.defaults | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 65c384a9c2..b5de90b253 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -73,3 +73,26 @@ INSTALL_MASK="${INSTALL_MASK} INSTALL_MASK="${INSTALL_MASK} /usr/bin/cvtsudoers " + +# Override UIDs and GIDs where ours differ from Gentoo defaults. +ACCT_GROUP_DIALOUT_ID=249 +ACCT_GROUP_INPUT_ID=28 +ACCT_GROUP_MESSAGEBUS_ID=201 +ACCT_USER_MESSAGEBUS_ID=201 +ACCT_GROUP_NTP_ID=203 +ACCT_USER_NTP_ID=203 +ACCT_GROUP_POLKITD_ID=235 +ACCT_USER_POLKITD_ID=235 +ACCT_GROUP_RENDER_ID=30 +ACCT_GROUP_SSHD_ID=204 +ACCT_USER_SSHD_ID=204 +ACCT_GROUP_SYSTEMD_JOURNAL_ID=248 +ACCT_GROUP_SYSTEMD_JOURNAL_REMOTE_ID=242 +ACCT_USER_SYSTEMD_JOURNAL_REMOTE_ID=242 +ACCT_GROUP_SYSTEMD_NETWORK_ID=244 +ACCT_USER_SYSTEMD_NETWORK_ID=244 +ACCT_GROUP_SYSTEMD_RESOLVE_ID=245 +ACCT_USER_SYSTEMD_RESOLVE_ID=245 +# tss seems to be one of those users with a mismatching UID/GID +ACCT_GROUP_TSS_ID=252 +ACCT_USER_TSS_ID=236