From 0750ebb6f95889951f9624da2d0fe0e87e2d232f Mon Sep 17 00:00:00 2001
From: invis-z <22781620+invis-z@users.noreply.github.com>
Date: Mon, 23 Jun 2025 16:32:29 +0800
Subject: [PATCH 1/2] podman: remove subuid/subgid creation from sysext

Following what was done for incus. Removes the subuid/gid from sysext.

Adding subuid/subgid could be done through Ignition:
```yaml
version: 1.1.0
variant: flatcar
storage:
  files:
    - path: /etc/subuid
      append:
        - inline: |
            core:1065536:65536
    - path: /etc/subgid
      append:
        - inline: |
            core:1065536:65536
```

Related: flatcar/Flatcar#1733
---
 build_library/sysext_mangle_flatcar-podman | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build_library/sysext_mangle_flatcar-podman b/build_library/sysext_mangle_flatcar-podman
index 5a5d24c4812..ee1fc7fce50 100755
--- a/build_library/sysext_mangle_flatcar-podman
+++ b/build_library/sysext_mangle_flatcar-podman
@@ -13,8 +13,6 @@ cp -a ./etc/{fuse.conf,containers} ./usr/share/podman/etc/
 cat <<EOF >>./usr/lib/tmpfiles.d/podman.conf
 C /etc/containers - - - - /usr/share/podman/etc/containers
 C /etc/fuse.conf - - - - /usr/share/podman/etc/fuse.conf
-w /etc/subuid - - - - core:1065536:65536
-w /etc/subgid - - - - core:1065536:65536
 EOF
 
 popd

From 4c49c6b986c952137547b4ec221b46ff6faaec24 Mon Sep 17 00:00:00 2001
From: invis-z <22781620+invis-z@users.noreply.github.com>
Date: Mon, 23 Jun 2025 16:45:44 +0800
Subject: [PATCH 2/2] changelog: add entry

---
 changelog/bugfixes/2025-06-23-podman.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/bugfixes/2025-06-23-podman.md

diff --git a/changelog/bugfixes/2025-06-23-podman.md b/changelog/bugfixes/2025-06-23-podman.md
new file mode 100644
index 00000000000..a283300f5e3
--- /dev/null
+++ b/changelog/bugfixes/2025-06-23-podman.md
@@ -0,0 +1 @@
+- sysext-podman: removed `/etc/subuid` and `/etc/subgid` generation for `core` user, before this change it partially overwrites the file and causes issues. ([Flatcar#1733](https://github.com/flatcar/Flatcar/issues/1733)) This could be created through initial provisioning. ([scripts#3043](https://github.com/flatcar/scripts/pull/3043))