Run root bootstrap from accessible home

This commit is contained in:
Nick Sweeting 2026-08-16 04:22:24 -07:00
parent 14238690a3
commit c3c9d1be1b
2 changed files with 3 additions and 2 deletions

View File

@ -32,6 +32,7 @@ def test_setup_script_gives_archivebox_user_ownership_of_runtime_parent_dirs():
assert 'chown "$ARCHIVEBOX_SYSTEM_UID:$ARCHIVEBOX_SYSTEM_GID" "$path"' in script
assert '"$HOME/.config/uv"' in script
assert 'runuser -u "$ARCHIVEBOX_SYSTEM_USER"' in script
assert '(cd "$HOME" && runuser' in script
assert 'run_as_archivebox_user "$BOOTSTRAP_UV_BINARY" tool run' in script
assert 'run_as_archivebox_user "$UV_BINARY" --no-config tool install' in script

View File

@ -130,9 +130,9 @@ run_as_archivebox_user() {
fi
if command -v runuser >/dev/null 2>&1; then
runuser -u "$ARCHIVEBOX_SYSTEM_USER" -- env HOME="$HOME" PATH="$PATH" ABXPKG_LIB_DIR="$ABXPKG_LIB_DIR" "$@"
(cd "$HOME" && runuser -u "$ARCHIVEBOX_SYSTEM_USER" -- env HOME="$HOME" PATH="$PATH" ABXPKG_LIB_DIR="$ABXPKG_LIB_DIR" "$@")
else
sudo -u "$ARCHIVEBOX_SYSTEM_USER" env HOME="$HOME" PATH="$PATH" ABXPKG_LIB_DIR="$ABXPKG_LIB_DIR" "$@"
(cd "$HOME" && sudo -u "$ARCHIVEBOX_SYSTEM_USER" env HOME="$HOME" PATH="$PATH" ABXPKG_LIB_DIR="$ABXPKG_LIB_DIR" "$@")
fi
}