Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
pavinjosdev committed Feb 20, 2024
2 parents 62e3d86 + 9d3bdc4 commit 5b732d2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

runs-on: ubuntu-latest
needs: setup
timeout-minutes: 10
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
Expand Down
7 changes: 2 additions & 5 deletions distrobox-enter
Original file line number Diff line number Diff line change
Expand Up @@ -575,16 +575,13 @@ if [ "${container_status}" != "running" ]; then
fi
# save starting loop timestamp in temp variable, we'll use it
# after to let logs command minimize possible holes
${container_manager} logs --since "${log_timestamp}" -f "${container_name}" \
> "${app_cache_dir}/.${container_name}.fifo" 2>&1 &
${container_manager} logs --since "${log_timestamp}" -f "${container_name}" 2> /dev/null \
> "${app_cache_dir}/.${container_name}.fifo" &
logs_pid="$!"

# read logs from log_timestamp to now, line by line
while IFS= read -r line; do
case "${line}" in
"+"*)
# Ignoring logging commands
;;
*"Error:"*)
printf >&2 "\033[31m %s\n\033[0m" "${line}"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion distrobox-init
Original file line number Diff line number Diff line change
Expand Up @@ -2256,7 +2256,7 @@ if [ -e /usr/lib/systemd/systemd ] || [ -e /lib/systemd/systemd ]; then
done && \
systemctl start user@${container_user_name}.service && \
systemctl start user-integration@${container_user_name}.service && \
loginctl enable-linger ${container_user_name} && \
loginctl enable-linger ${container_user_name} || : && \
echo container_setup_done" &

[ -e /usr/lib/systemd/systemd ] && exec /usr/lib/systemd/systemd --system --log-target=console --unit=multi-user.target
Expand Down

0 comments on commit 5b732d2

Please sign in to comment.