InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50059 from shangmu/master

Browse Source 
dockerd-rootless-setuptool.sh: Fix silent stop on error due to using output redirection together wit…
This commit is contained in:
Sebastiaan van Stijn
2025-06-03 12:05:03 +02:00
committed by GitHub
parent a8d3645957 6889039d76
commit e2b9f3d844
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/dockerd-rootless-setuptool.sh
View File

@@ -238,12 +238,13 @@ init() {
fi fi
# instructions: validate subuid for current user # instructions: validate subuid for current user
error_subid=
if command -v "getsubids" > /dev/null 2>&1; then if command -v "getsubids" > /dev/null 2>&1; then
getsubids "$USERNAME" > /dev/null 2>&1 || getsubids "$(id -u)" > /dev/null 2>&1 getsubids "$USERNAME" > /dev/null 2>&1 || getsubids "$(id -u)" > /dev/null 2>&1 || error_subid=1
else else
grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subuid 2> /dev/null grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subuid 2> /dev/null || error_subid=1
fi fi
if [ $? -ne 0 ]; then if [ "$error_subid" = "1" ]; then
instructions=$( instructions=$(
cat <<- EOI cat <<- EOI
${instructions} ${instructions}
@@ -254,12 +255,13 @@ init() {
fi fi
# instructions: validate subgid for current user # instructions: validate subgid for current user
error_subid=
if command -v "getsubids" > /dev/null 2>&1; then if command -v "getsubids" > /dev/null 2>&1; then
getsubids -g "$USERNAME" > /dev/null 2>&1 || getsubids -g "$(id -u)" > /dev/null 2>&1 getsubids -g "$USERNAME" > /dev/null 2>&1 || getsubids -g "$(id -u)" > /dev/null 2>&1 || error_subid=1
else else
grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subgid 2> /dev/null grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subgid 2> /dev/null || error_subid=1
fi fi
if [ $? -ne 0 ]; then if [ "$error_subid" = "1" ]; then
instructions=$( instructions=$(
cat <<- EOI cat <<- EOI
${instructions} ${instructions}