al/tiny-cloud
al/tiny-cloud
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-15 11:22:43 +03:00
Code Packages Wiki

Implement primary_group for users

Browse Source
This commit is contained in:
Natanael Copa 2024-07-31 22:48:02 +02:00
parent 7492d6f128
commit e791e0494d
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tiny-cloud/user-data/alpine-config
View File

@ -270,7 +270,7 @@ in_list() {
init__userdata_users() { init__userdata_users() {
local users="$(get_userdata users)" local users="$(get_userdata users)"
for i in $users; do for i in $users; do
local name gecos homedir shell groups local name gecos homedir shell primary_group groups
local system=false no_create_home=false lock_passwd=true local system=false no_create_home=false lock_passwd=true
local keys="$(get_userdata users/$i)" local keys="$(get_userdata users/$i)"
if [ "$i" = 1 ] && [ "$keys" = "default" ]; then if [ "$i" = 1 ] && [ "$keys" = "default" ]; then
@ -290,6 +290,9 @@ init__userdata_users() {
if in_list shell $keys; then if in_list shell $keys; then
shell="$(get_userdata users/$i/shell)" shell="$(get_userdata users/$i/shell)"
fi fi
if in_list primary_group $keys; then
primary_group="$(get_userdata users/$i/primary_group)"
fi
if in_list system $keys; then if in_list system $keys; then
system="$(get_userdata users/$i/system)" system="$(get_userdata users/$i/system)"
fi fi
@ -306,7 +309,7 @@ init__userdata_users() {
if [ "$no_create_home" != "true" ]; then if [ "$no_create_home" != "true" ]; then
unset no_create_home unset no_create_home
fi fi
$MOCK adduser -D ${gecos:+-g "$gecos"} ${homedir:+-h "$homedir"} ${shell:+-s "$shell"} ${system:+-S} ${no_create_home:+-H} "$name" $MOCK adduser -D ${gecos:+-g "$gecos"} ${homedir:+-h "$homedir"} ${shell:+-s "$shell"} ${primary_group:+-G "$primary_group"} ${system:+-S} ${no_create_home:+-H} "$name"
fi fi
if in_list lock_passwd $keys; then if in_list lock_passwd $keys; then

17
tests/tiny-cloud-alpine.test
View File

@ -22,6 +22,7 @@ init_tests \
userdata_users_gecos \ userdata_users_gecos \
userdata_users_homedir \ userdata_users_homedir \
userdata_users_shell \ userdata_users_shell \
userdata_users_primary_group \
userdata_users_system \ userdata_users_system \
userdata_users_no_create_home \ userdata_users_no_create_home \
userdata_users_groups \ userdata_users_groups \
@ -250,6 +251,22 @@ userdata_users_shell_body() {
tiny-cloud main tiny-cloud main
} }
userdata_users_primary_group_body() {
# first specified user will replace default user
fake_userdata_nocloud <<-EOF
#alpine-config
users:
- default
- name: foo
primary_group: wheel
EOF
atf_check -e ignore -o ignore tiny-cloud early
atf_check \
-e match:"userdata_users: done" \
-o match:"adduser.*-G wheel.*foo" \
tiny-cloud main
}
userdata_users_system_body() { userdata_users_system_body() {
# first specified user will replace default user # first specified user will replace default user
fake_userdata_nocloud <<-EOF fake_userdata_nocloud <<-EOF