summaryrefslogtreecommitdiffstats
path: root/buildrun.cxx
diff options
context:
space:
mode:
authorElliott Baron <ebaron@toriamos.yyz.redhat.com>2008-12-05 16:46:32 -0500
committerElliott Baron <ebaron@toriamos.yyz.redhat.com>2008-12-05 16:46:32 -0500
commitece3457a5cc92f0968ebf52823af2d017d5272c1 (patch)
tree45833a5ca9d552032a1d52f005d5e92e1f3ab441 /buildrun.cxx
parent5cf5735849650a89aa3182dfbacd8218ac0f3b9e (diff)
parent2f62657ce707b4011253d533c0423ed8d49a3e9e (diff)
downloadsystemtap-steved-ece3457a5cc92f0968ebf52823af2d017d5272c1.tar.gz
systemtap-steved-ece3457a5cc92f0968ebf52823af2d017d5272c1.tar.xz
systemtap-steved-ece3457a5cc92f0968ebf52823af2d017d5272c1.zip
Merge branch 'master'; commit 'origin/pr6925'
Diffstat (limited to 'buildrun.cxx')
-rw-r--r--buildrun.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/buildrun.cxx b/buildrun.cxx
index c6f465c5..9078a035 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -1,5 +1,5 @@
// build/run probes
-// Copyright (C) 2005-2007 Red Hat Inc.
+// Copyright (C) 2005-2008 Red Hat Inc.
//
// This file is part of systemtap, and is free software. You can
// redistribute it and/or modify it under the terms of the GNU General
@@ -268,11 +268,9 @@ run_pass (systemtap_session& s)
{
int rc = 0;
- struct passwd *pw = getpwuid(getuid());
- string username = string(pw->pw_name);
-
// for now, just spawn staprun
- string staprun_cmd = string(BINDIR) + "/staprun "
+ string staprun_cmd = string(getenv("SYSTEMTAP_STAPRUN") ?: BINDIR "/staprun")
+ + " "
+ (s.verbose>1 ? "-v " : "")
+ (s.verbose>2 ? "-v " : "")
+ (s.output_file.empty() ? "" : "-o " + s.output_file + " ");