X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=usttrace;h=52c378dfbd12041636f1630e7b82d49ee51bcbb6;hb=2782fc4bdcc62e3448c59f30dbb07d88d901a597;hp=b3af05d7a167cb4da41507e09cd8230264f025af;hpb=8232f1db6950f4c5bc0611a30e9b8f2d70618644;p=lttng-ust.git

diff --git a/usttrace b/usttrace
index b3af05d7..52c378df 100755
--- a/usttrace
+++ b/usttrace
@@ -80,7 +80,7 @@ then
 	pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ustd-pid"
 	mkfifo -m 0600 "$pidfilepath"
 	# Start daemon
-	$USTD -d --pidfile "$pidfilepath" -s "$SOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &
+	$USTD --pidfile "$pidfilepath" -s "$SOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &
 	USTDPID="$(<$pidfilepath)"
 	export UST_DAEMON_SOCKET="$SOCKPATH"
 fi
@@ -129,7 +129,7 @@ then
 	kill -SIGTERM "$USTDPID"
 
 	echo "Waiting for ustd to shutdown..."
-	wait
+	wait "$(USTDPID)"
 
 	rm "$pidfilepath"
 fi