From 96987026159c38af566d7f19d9b9bcf1c96cec97 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:25 +0100 Subject: [PATCH] support/scripts/mkusers: fix UID/GID confusion Commit 41ea61d59c3e (support/scripts/mkusers: allow option for system uid/gid) confused GID and UID variables: the GID limits were used to create UIDs. Fix that. Note that this fixes a shellcheck error; although there are many more shellcheck errors, these fixes are semantically a bug that need to be fixed separately from the coding style issues reported by shellcheck. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ebbcf5a0a752519efffeba432f347b49950b1f16) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 4fc06f8fdf..d786943cf8 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -324,9 +324,9 @@ add_one_user() { # Generate a new UID if needed if [ ${uid} -eq ${AUTO_USER_ID} ]; then - uid="$( generate_uid "${username}" $FIRST_USER_GID $LAST_USER_GID )" + uid="$( generate_uid "${username}" $FIRST_USER_UID $LAST_USER_UID )" elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then - uid="$( generate_uid "${username}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" fi # Remove any previous instance of this user