twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-10-14 06:34:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Show Passt output on error (#1059)

Browse Source
This commit is contained in:
Kroese 2025-10-13 14:11:54 +02:00 committed by GitHub
parent c3302e1720
commit 1ffc5c55b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network.sh
View File

@ -324,12 +324,19 @@ configurePasst() {
[[ "$DEBUG" == [Yy1]* ]] && printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}" [[ "$DEBUG" == [Yy1]* ]] && printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}"
if ! $PASST ${PASST_OPTS:+ $PASST_OPTS} >/dev/null 2>&1; then if ! $PASST ${PASST_OPTS:+ $PASST_OPTS} >/dev/null 2>&1; then
local msg="Failed to start passt, reason: $?"
rm -f "$log"
PASST_OPTS="${PASST_OPTS/ -q/}"
{ $PASST ${PASST_OPTS:+ $PASST_OPTS}; rc=$?; } || :
if (( rc != 0 )); then
[ -f "$log" ] && cat "$log" [ -f "$log" ] && cat "$log"
error "$msg" error "Failed to start passt, reason: $rc"
return 1 return 1
fi fi
fi
if [[ "$PASST_DEBUG" == [Yy1]* ]]; then if [[ "$PASST_DEBUG" == [Yy1]* ]]; then
tail -fn +0 "$log" --pid=$$ & tail -fn +0 "$log" --pid=$$ &
else else