Skip to content

Commit 489eb79

Browse files
committed
build_library/build_image_util.sh: Fix copy-pasta
We were supposed to collect allowed users and allowed groups into separate arrays. Due to the copy-paste mistake, we overwrote allowed users array with allowed groups while leaving the array for allowed groups empty, so we ended up passing only allowed groups instead of both.
1 parent f028bad commit 489eb79

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build_library/build_image_util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ finish_image() {
654654
# --allow-user=root
655655
# --allow-user=core
656656
mapfile -t allowed_users < <(grep '^COPY_USERS=' "${root_fs_dir}/sbin/flatcar-tmpfiles" | sed -e 's/.*="\([^"]*\)"/\1/' | tr '|' '\n' | sed -e 's/^/--allow-user=/')
657-
mapfile -t allowed_users < <(grep '^COPY_GROUPS=' "${root_fs_dir}/sbin/flatcar-tmpfiles" | sed -e 's/.*="\([^"]*\)"/\1/' | tr '|' '\n' | sed -e 's/^/--allow-group=/')
657+
mapfile -t allowed_groups < <(grep '^COPY_GROUPS=' "${root_fs_dir}/sbin/flatcar-tmpfiles" | sed -e 's/.*="\([^"]*\)"/\1/' | tr '|' '\n' | sed -e 's/^/--allow-group=/')
658658
sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \
659659
--output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_var.conf" \
660660
"${ignores[@]}" "${allowed_users[@]}" "${allowed_groups[@]}" "${root_fs_dir}/var"

0 commit comments

Comments
 (0)