diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-18 19:14:25 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-18 19:14:25 +0100 |
| commit | 547a3b44141e7c7b6548d130bb37f18a634a50a2 (patch) | |
| tree | f13c681a2f045d8d133e9388aded783bf9de4e0d /stap-server | |
| parent | 471fca5e53a239f7fa4d04b7b6d6f53765a3d598 (diff) | |
| parent | a18a40d0cf1408d5575165ebc4374a1ab4f9fbc0 (diff) | |
| download | systemtap-steved-547a3b44141e7c7b6548d130bb37f18a634a50a2.tar.gz systemtap-steved-547a3b44141e7c7b6548d130bb37f18a634a50a2.tar.xz systemtap-steved-547a3b44141e7c7b6548d130bb37f18a634a50a2.zip | |
Merge commit 'origin/master'
Diffstat (limited to 'stap-server')
| -rwxr-xr-x | stap-server | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/stap-server b/stap-server index d69119db..9e30a121 100755 --- a/stap-server +++ b/stap-server @@ -285,7 +285,11 @@ function parse_options { ;; m) get_arg $first_token $2 - stap_options="$stap_options -$first_char $stap_arg" + if test $unprivileged = 1; then + fatal "You can't specify -$first_char and --unprivileged together." + else + stap_options="$stap_options -$first_char $stap_arg" + fi ;; o) get_arg $first_token $2 |