[PATCH 2/2] initscript: allow scripts to load uprobes

[Stefan Hajnoczi]

Scripts that rely on userspace probing must include the -u option in
their conf file:

  # cat /etc/systemtap/conf.d/example.conf
  example_OPT=-u

The uprobe kernel module will be loaded when the script runs.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 initscript/systemtap.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/initscript/systemtap.in b/initscript/systemtap.in
index 7e9c680..1e66694 100755
--- a/initscript/systemtap.in
+++ b/initscript/systemtap.in
@@ -401,7 +401,7 @@ get_compile_opts () { # opts
     case $o in
     -p|-m|-r|-c|-x|-e|-s|-o|-S)
        skip=1 ;;
-    -h|-V|-k|-F)
+    -h|-V|-k|-F|-u)
       ;;
     *)
       echo -n $o" " ;;
@@ -420,6 +420,12 @@ get_run_opts () { # normalized_opts
   show=0
   for o in $opts; do
     case $o in
+    -u)
+      # Use cached uprobes module, if available
+      if [ -f "$CACHE_PATH/uprobes/uprobes.ko" ]; then
+        echo -n "-u$CACHE_PATH/uprobes/uprobes.ko "
+      fi
+      ;;
     -c|-x|-s|-o|-S)
       [ $o == '-s' ] && o='-b'
       [ $o == '-o' ] && mode='-D'
-- 
1.9.3