diff options
| author | David Smith <dsmith@redhat.com> | 2009-09-01 15:20:39 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-09-01 15:20:39 -0500 |
| commit | 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 (patch) | |
| tree | 33c024e1ee5e3c9be667378182e4189855b0ac86 /initscript | |
| parent | 4569f6bb769482d732f72fb1208522d51f4e36f4 (diff) | |
| download | systemtap-steved-635035ca64e9c6e6ad8252545446bbf9bc2a9c55.tar.gz systemtap-steved-635035ca64e9c6e6ad8252545446bbf9bc2a9c55.tar.xz systemtap-steved-635035ca64e9c6e6ad8252545446bbf9bc2a9c55.zip | |
PR10552: Removed references to the merge ('-M') option.
* hash.cxx (find_script_hash): Removed unused merge option.
* main.cxx (checkOptions): Removed merge option checks.
(main): Removed merge option.
* session.h: Ditto.
* initscript/README.initscript: Removed reference to '-M' option.
* initscript/systemtap.in (stap_getopt): Ditto.
* testsuite/parseko/cmdline01.stp: Removed merge option test.
* testsuite/parseko/cmdline05.stp: Ditto.
Diffstat (limited to 'initscript')
| -rw-r--r-- | initscript/README.initscript | 2 | ||||
| -rw-r--r-- | initscript/systemtap.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/initscript/README.initscript b/initscript/README.initscript index ee11f3be..c7bb4888 100644 --- a/initscript/README.initscript +++ b/initscript/README.initscript @@ -223,7 +223,7 @@ Configuration file allows us - Below options are ignored when compiling script. -p,-m,-r,-c,-x,-e,-s,-o,-h,-V,-k - Below options are ignored when starting script. - -h,-V,-M,-v,-t,-p,-I,-e,-R,-r,-m,-k,-g,-P,-D,-b,-u,-q,-w,-l,-d,-L,-F, and + -h,-V,-v,-t,-p,-I,-e,-R,-r,-m,-k,-g,-P,-D,-b,-u,-q,-w,-l,-d,-L,-F, and other long options. 4.2.2 <script-name>_REQ diff --git a/initscript/systemtap.in b/initscript/systemtap.in index 7552df44..21bcd65b 100644 --- a/initscript/systemtap.in +++ b/initscript/systemtap.in @@ -287,7 +287,7 @@ stap_getopt () { # opts # TODO: support quoted options getopt -s bash -u \ -l 'kelf,kmap::,ignore-vmlinux,ignore-dwarf,vp:' \ - -o 'hVMvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:' -- $@ + -o 'hVvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:' -- $@ ret=$? [ $ret -ne 0 ] && slog "Failed to parse parameters. ($@)" return $ret |