diff options
author | Mark Wielaard <mjw@redhat.com> | 2009-08-10 18:28:40 +0200 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2009-08-10 18:28:40 +0200 |
commit | a09930468b2d2bae134067d50a9b15b5ba2af548 (patch) | |
tree | 55d63f519608816a73353ccabe9932d2134d4872 | |
parent | 8c938ec723aad41c6cafcdef24679d40f310396c (diff) | |
parent | 770e94e841ccaf6fc7446709b85d4152245ab5b9 (diff) | |
download | systemtap-steved-a09930468b2d2bae134067d50a9b15b5ba2af548.tar.gz systemtap-steved-a09930468b2d2bae134067d50a9b15b5ba2af548.tar.xz systemtap-steved-a09930468b2d2bae134067d50a9b15b5ba2af548.zip |
Merge branch 'master' of ssh://mark@sourceware.org/git/systemtap
-rw-r--r-- | runtime/staprun/staprun.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c index c64bf5b3..7eb7f28f 100644 --- a/runtime/staprun/staprun.c +++ b/runtime/staprun/staprun.c @@ -132,9 +132,14 @@ static int enable_uprobes(void) snprintf (runtimeko, sizeof(runtimeko), "%s/uprobes/uprobes.ko", (getenv("SYSTEMTAP_RUNTIME") ?: PKGDATADIR "/runtime")); dbug(2, "Inserting uprobes module from SystemTap runtime %s.\n", runtimeko); - argv[0] = NULL; + i = 0; + argv[i++] = "/sbin/insmod"; + argv[i++] = runtimeko; + argv[i] = NULL; + if (run_as(0, 0, 0, argv[0], argv) == 0) + return 0; - return insert_module(runtimeko, NULL, argv); + return 1; /* failure */ } static int insert_stap_module(void) |