Allow using dev image as root

osteffenrh · osteffenrh · commit 304b9017ebea · 2023-12-06T17:27:20.000+01:00
Don't abort the entrypoint script if the user-id already exists. This allows using the dev images as root or when using Podman, which does some user mapping already. See issue tianocore#76 and PR tianocore#77. Signed-off-by: Oliver Steffen <osteffen@redhat.com>
diff --git a/Fedora-39/fedora39_dev_entrypoint.sh b/Fedora-39/fedora39_dev_entrypoint.sh
@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
   -G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")`
`39`	`39`	`groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"`
`40`	`40`	`#`
`41`	`41`	`# - Add the user.`
`42`		`-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \`
	`42`	`+useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \`
`43`	`43`	`-G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash`
`44`	`44`
`45`	`45`	`echo "${EDK2_DOCKER_USER}":tianocore \| chpasswd`