From 15aaf4677b09c7abf1cce7373a545813e8fca290 Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <maximilian@schmidt.so>
Date: Wed, 20 Jan 2021 00:05:06 +0100
Subject: [PATCH] Add support for rootless podman with userns keep-id

Running `./kas-container` as rootless podman container fails with:

```
groupadd: Permission denied.
groupadd: cannot lock /etc/group; try again later.
useradd: Permission denied.
useradd: cannot lock /etc/passwd; try again later.
```

This patch add a check whether the correct USER_ID is already in use.

Co-authored-by: Nicolas Riebesel <nicolas.riebesel@gmx.com>
Signed-off-by: Maximilian Schmidt <maximilian@schmidt.so>
[Jan: fixed indention]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 container-entrypoint | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/container-entrypoint b/container-entrypoint
index 8a41f02..e756e95 100755
--- a/container-entrypoint
+++ b/container-entrypoint
@@ -18,6 +18,8 @@ if [ $USER_ID == 0 ]; then
 	# We shall run everything as root
 	mkdir -p /builder
 
+	GOSU=""
+elif [ $USER_ID == $UID ]; then
 	GOSU=""
 else
 	if ! grep -q "^builder:" /etc/group; then