jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

support/mkusers: rename variable to avoid name clashing

Browse Source 
The LINES variable is automatically set by bash to represent the number
of lines in the terminal. That variable can be set when the shell
receives SIGWINCH.

If the shell does receive SIGWINCH after our LINES array is filled, the
content of the array is mangled.

Rename the variable to avoid that.

Fixes #9456

Reported-by: George Y. <georgebrmz@oss3d.com>
Reported-by: Paul Stewart <paulstewartis@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2017-03-03 23:07:20 +01:00 committed by Thomas Petazzoni
parent 7372c80cc5
commit 00d34e8a6f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
support/scripts/mkusers
View File

@ -359,7 +359,7 @@ add_one_user() {
main() { main() {
local username uid group gid passwd home shell groups comment local username uid group gid passwd home shell groups comment
local line local line
local -a LINES local -a ENTRIES
# Some sanity checks # Some sanity checks
if [ ${MIN_UID} -le 0 ]; then if [ ${MIN_UID} -le 0 ]; then
@ -371,7 +371,7 @@ main() {
# Read in all the file in memory, exclude empty lines and comments # Read in all the file in memory, exclude empty lines and comments
while read line; do while read line; do
LINES+=( "${line}" ) ENTRIES+=( "${line}" )
done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" )
# We first create groups whose gid is not -1, and then we create groups # We first create groups whose gid is not -1, and then we create groups
@ -380,14 +380,14 @@ main() {
# used, rather than a different automatic gid is computed. # used, rather than a different automatic gid is computed.
# First, create all the main groups which gid is *not* automatic # First, create all the main groups which gid is *not* automatic
for line in "${LINES[@]}"; do for line in "${ENTRIES[@]}"; do
read username uid group gid passwd home shell groups comment <<<"${line}" read username uid group gid passwd home shell groups comment <<<"${line}"
[ ${gid} -ge 0 ] || continue # Automatic gid [ ${gid} -ge 0 ] || continue # Automatic gid
add_one_group "${group}" "${gid}" add_one_group "${group}" "${gid}"
done done
# Then, create all the main groups which gid *is* automatic # Then, create all the main groups which gid *is* automatic
for line in "${LINES[@]}"; do for line in "${ENTRIES[@]}"; do
read username uid group gid passwd home shell groups comment <<<"${line}" read username uid group gid passwd home shell groups comment <<<"${line}"
[ ${gid} -eq -1 ] || continue # Non-automatic gid [ ${gid} -eq -1 ] || continue # Non-automatic gid
add_one_group "${group}" "${gid}" add_one_group "${group}" "${gid}"
@ -396,7 +396,7 @@ main() {
# Then, create all the additional groups # Then, create all the additional groups
# If any additional group is already a main group, we should use # If any additional group is already a main group, we should use
# the gid of that main group; otherwise, we can use any gid # the gid of that main group; otherwise, we can use any gid
for line in "${LINES[@]}"; do for line in "${ENTRIES[@]}"; do
read username uid group gid passwd home shell groups comment <<<"${line}" read username uid group gid passwd home shell groups comment <<<"${line}"
if [ "${groups}" != "-" ]; then if [ "${groups}" != "-" ]; then
for g in ${groups//,/ }; do for g in ${groups//,/ }; do
@ -411,7 +411,7 @@ main() {
# uid be generated. # uid be generated.
# Now, add users whose uid is *not* automatic # Now, add users whose uid is *not* automatic
for line in "${LINES[@]}"; do for line in "${ENTRIES[@]}"; do
read username uid group gid passwd home shell groups comment <<<"${line}" read username uid group gid passwd home shell groups comment <<<"${line}"
[ "${username}" != "-" ] || continue # Magic string to skip user creation [ "${username}" != "-" ] || continue # Magic string to skip user creation
[ ${uid} -ge 0 ] || continue # Automatic uid [ ${uid} -ge 0 ] || continue # Automatic uid
@ -420,7 +420,7 @@ main() {
done done
# Finally, add users whose uid *is* automatic # Finally, add users whose uid *is* automatic
for line in "${LINES[@]}"; do for line in "${ENTRIES[@]}"; do
read username uid group gid passwd home shell groups comment <<<"${line}" read username uid group gid passwd home shell groups comment <<<"${line}"
[ "${username}" != "-" ] || continue # Magic string to skip user creation [ "${username}" != "-" ] || continue # Magic string to skip user creation
[ ${uid} -eq -1 ] || continue # Non-automatic uid [ ${uid} -eq -1 ] || continue # Non-automatic uid