summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2022-07-06 20:18:18 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2022-07-27 16:11:03 +0100
commit5ede30e1a37eb79454a73d5e78047f048d25e4ad (patch)
tree422c43f02fc8444c0fc0913bab209484640322e0
parent74fd5a7abbe117c82beb829ced3c7643b88c37a8 (diff)
downloadmeta-el-nfv-access-master.tar.gz
images: Work around broken systemd_create_usersHEADmaster
Since we use static UID/GID for all users and groups on the platform, we run into the issue described in [1] (upstream on "master" branch), since [2] started to generate the users/groups dynamically at build time based on all sysusers.d framents (not only "systemd.conf" like in previous releases). So "systemd_create_users": - is completly redundant for Enea Edge Runtime since we populate all users and groups statically; - breaks the build; - won't be fixed upstream since Hardknott is already EOL; - can't be omitted by pinning poky to a previous commit (lots of CVE fixes are newer than [2] + some recipe SRC_URI were updated after [2] was merged); - is easy to just disable for the machines where we know we have static UID/GID (this is why we apply the change in local.conf); [1] https://git.yoctoproject.org/poky/commit/meta/classes/\ rootfs-postcommands.bbclass?id=a559a2cba9284a1531fbc402c6fda1c5a51259c1 [2] https://git.yoctoproject.org/poky/commit/meta/classes/\ rootfs-postcommands.bbclass?id=8eee0062a7a036d0594dff193995ac7914c6124b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Change-Id: Iac50346ced5aec29cda4561da85f2d4f50560f38 (cherry picked from commit 36676c77186d9681b0c0d263d2a880e3e5bc9080)
-rw-r--r--conf/template.atom-c3000-debug/local.conf.sample1
-rw-r--r--conf/template.atom-c3000/local.conf.sample1
-rw-r--r--conf/template.xeon-d-debug/local.conf.sample1
-rw-r--r--conf/template.xeon-d/local.conf.sample1
4 files changed, 4 insertions, 0 deletions
diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample
index b96bf48..1c5fbb2 100644
--- a/conf/template.atom-c3000-debug/local.conf.sample
+++ b/conf/template.atom-c3000-debug/local.conf.sample
@@ -259,6 +259,7 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
259USERADDEXTENSION = "useradd-staticids" 259USERADDEXTENSION = "useradd-staticids"
260USERADD_UID_TABLES = "files/passwd" 260USERADD_UID_TABLES = "files/passwd"
261USERADD_GID_TABLES = "files/group" 261USERADD_GID_TABLES = "files/group"
262ROOTFS_POSTPROCESS_COMMAND_remove = "systemd_create_users;"
262# 263#
263# In order to prevent generating a system where a dynamicly assigned uid/gid 264# In order to prevent generating a system where a dynamicly assigned uid/gid
264# can exist, you should enable the following setting. This will force the 265# can exist, you should enable the following setting. This will force the
diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample
index c6cbdba..54d065c 100644
--- a/conf/template.atom-c3000/local.conf.sample
+++ b/conf/template.atom-c3000/local.conf.sample
@@ -256,6 +256,7 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
256USERADDEXTENSION = "useradd-staticids" 256USERADDEXTENSION = "useradd-staticids"
257USERADD_UID_TABLES = "files/passwd" 257USERADD_UID_TABLES = "files/passwd"
258USERADD_GID_TABLES = "files/group" 258USERADD_GID_TABLES = "files/group"
259ROOTFS_POSTPROCESS_COMMAND_remove = "systemd_create_users;"
259# 260#
260# In order to prevent generating a system where a dynamicly assigned uid/gid 261# In order to prevent generating a system where a dynamicly assigned uid/gid
261# can exist, you should enable the following setting. This will force the 262# can exist, you should enable the following setting. This will force the
diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample
index 4be1706..3f8ef4a 100644
--- a/conf/template.xeon-d-debug/local.conf.sample
+++ b/conf/template.xeon-d-debug/local.conf.sample
@@ -260,6 +260,7 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
260USERADDEXTENSION = "useradd-staticids" 260USERADDEXTENSION = "useradd-staticids"
261USERADD_UID_TABLES = "files/passwd" 261USERADD_UID_TABLES = "files/passwd"
262USERADD_GID_TABLES = "files/group" 262USERADD_GID_TABLES = "files/group"
263ROOTFS_POSTPROCESS_COMMAND_remove = "systemd_create_users;"
263# 264#
264# In order to prevent generating a system where a dynamicly assigned uid/gid 265# In order to prevent generating a system where a dynamicly assigned uid/gid
265# can exist, you should enable the following setting. This will force the 266# can exist, you should enable the following setting. This will force the
diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample
index a1a874d..ace57dd 100644
--- a/conf/template.xeon-d/local.conf.sample
+++ b/conf/template.xeon-d/local.conf.sample
@@ -257,6 +257,7 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
257USERADDEXTENSION = "useradd-staticids" 257USERADDEXTENSION = "useradd-staticids"
258USERADD_UID_TABLES = "files/passwd" 258USERADD_UID_TABLES = "files/passwd"
259USERADD_GID_TABLES = "files/group" 259USERADD_GID_TABLES = "files/group"
260ROOTFS_POSTPROCESS_COMMAND_remove = "systemd_create_users;"
260# 261#
261# In order to prevent generating a system where a dynamicly assigned uid/gid 262# In order to prevent generating a system where a dynamicly assigned uid/gid
262# can exist, you should enable the following setting. This will force the 263# can exist, you should enable the following setting. This will force the