Merge pull request #1 from GJRTimmer/GJRTimmer-patch-77

gjrtimmer · web-flow · commit 023bec8cc6af · 2016-08-31T13:58:23.000+02:00
Fix #77 groupmod added (non-unique -o)
diff --git a/runtime/functions b/runtime/functions
@@ -19,7 +19,7 @@ map_uidgid() {
   USERMAP_UID=${USERMAP_UID:-$USERMAP_ORIG_UID}
   if [[ ${USERMAP_UID} != ${USERMAP_ORIG_UID} ]] || [[ ${USERMAP_GID} != ${USERMAP_ORIG_GID} ]]; then
     echo "Adapting uid and gid for ${PG_USER}:${PG_USER} to $USERMAP_UID:$USERMAP_GID"
-    groupmod -g ${USERMAP_GID} ${PG_USER}
+    groupmod -o -g ${USERMAP_GID} ${PG_USER}
     sed -i -e "s|:${USERMAP_ORIG_UID}:${USERMAP_GID}:|:${USERMAP_UID}:${USERMAP_GID}:|" /etc/passwd
   fi
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ map_uidgid() {`
`19`	`19`	`USERMAP_UID=${USERMAP_UID:-$USERMAP_ORIG_UID}`
`20`	`20`	`if [[ ${USERMAP_UID} != ${USERMAP_ORIG_UID} ]] \|\| [[ ${USERMAP_GID} != ${USERMAP_ORIG_GID} ]]; then`
`21`	`21`	`echo "Adapting uid and gid for ${PG_USER}:${PG_USER} to $USERMAP_UID:$USERMAP_GID"`
`22`		`- groupmod -g ${USERMAP_GID} ${PG_USER}`
	`22`	`+ groupmod -o -g ${USERMAP_GID} ${PG_USER}`
`23`	`23`	`sed -i -e "s\|:${USERMAP_ORIG_UID}:${USERMAP_GID}:\|:${USERMAP_UID}:${USERMAP_GID}:\|" /etc/passwd`
`24`	`24`	`fi`
`25`	`25`	`}`