From fcb6e977769c983ca1bbc62c8000bc087de38f89 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 18 Jun 2025 10:04:27 +0200 Subject: [PATCH 1/2] incus: remove subuid / subgid creation from sysext This create more issues than it solves: * override existing subuid / subgid * not flexible for the end user * it has to be created only once (while tmpfiles always try to create those files) I think Flatcar should not be responsible to create this and it should be documented on how to do it through Ignition: ```yaml version: 1.1.0 variant: flatcar storage: files: - path: /etc/subuid append: - inline: | root:1065536:65536 - path: /etc/subgid append: - inline: | root:1065536:65536 ``` Signed-off-by: Mathieu Tortuyaux --- build_library/sysext_mangle_flatcar-incus | 2 -- 1 file changed, 2 deletions(-) diff --git a/build_library/sysext_mangle_flatcar-incus b/build_library/sysext_mangle_flatcar-incus index d7ac982c8d..869fc5f0d1 100755 --- a/build_library/sysext_mangle_flatcar-incus +++ b/build_library/sysext_mangle_flatcar-incus @@ -14,8 +14,6 @@ mkdir -p ./usr/lib/tmpfiles.d pushd ./usr/lib/tmpfiles.d cat <./10-incus.conf d /var/lib/lxc/rootfs 0755 root root - - -w+ /etc/subuid - - - - root:1065536:65536 -w+ /etc/subgid - - - - root:1065536:65536 EOF popd From b1d1157e6516a737b9d29030e1d75448983d538a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 18 Jun 2025 10:13:54 +0200 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/changes/2025-06-18-incus.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2025-06-18-incus.md diff --git a/changelog/changes/2025-06-18-incus.md b/changelog/changes/2025-06-18-incus.md new file mode 100644 index 0000000000..50215bbd0f --- /dev/null +++ b/changelog/changes/2025-06-18-incus.md @@ -0,0 +1 @@ +- sysext-incus: removed `/etc/subuid` and `/etc/subgid` generation for `root` user, it has to be created through initial provisioning. ([scripts#3028](https://github.com/flatcar/scripts/pull/3028))