remove calls to PVE::RPCEnvironment

[pve-common.git] / src / PVE / CLIHandler.pm

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index 2a9a6c9e8e0d9bba534e164d1bf13de178f54487..199241f0ae5288748ceef2586714301e8aeb4fa4 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -112,7 +112,7 @@ __PACKAGE__->register_method ({
 
     }});
 
-sub print_simple_asciidoc_synopsys {
+sub print_simple_asciidoc_synopsis {
     my ($class, $name, $arg_param, $uri_param) = @_;
 
     die "not initialized" if !$cli_handler_class;
@@ -128,7 +128,7 @@ sub print_simple_asciidoc_synopsys {
     return $synopsis;
 }
 
-sub print_asciidoc_synopsys {
+sub print_asciidoc_synopsis {
 
     die "not initialized" if !($cmddef && $exename && $cli_handler_class);
 
@@ -363,6 +363,11 @@ sub find_cli_class_source {
 
 sub generate_asciidoc_synopsys {
     my ($class) = @_;
+    $class->generate_asciidoc_synopsis();
+};
+
+sub generate_asciidoc_synopsis {
+    my ($class) = @_;
 
     $cli_handler_class = $class;
 
@@ -372,13 +377,13 @@ sub generate_asciidoc_synopsys {
     my $def = ${"${class}::cmddef"};
 
     if (ref($def) eq 'ARRAY') {
-       print_simple_asciidoc_synopsys(@$def);
+       print_simple_asciidoc_synopsis(@$def);
     } else {
        $cmddef = $def;
 
        $cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
 
-       print_asciidoc_synopsys();
+       print_asciidoc_synopsis();
     }
 }
 
@@ -467,14 +472,12 @@ sub run_cli_handler {
 
     foreach my $key (keys %params) {
        next if $key eq 'prepare';
-       next if $key eq 'no_init'; # used by lxc hooks
-       next if $key eq 'no_rpcenv';
+       next if $key eq 'no_init'; # not used anymore
+       next if $key eq 'no_rpcenv'; # not used anymore
        die "unknown parameter '$key'";
     }
 
     my $preparefunc = $params{prepare};
-    my $no_init = $params{no_init};
-    my $no_rpcenv = $params{no_rpcenv};
 
     my $pwcallback = $class->can('read_password');
     my $stringfilemap = $class->can('string_param_file_mapping');
@@ -485,15 +488,6 @@ sub run_cli_handler {
 
     if ($class !~ m/^PVE::Service::/) {
        die "please run as root\n" if $> != 0;
-
-       PVE::INotify::inotify_init() if !$no_init;
-
-       if (!$no_rpcenv) {
-       my $rpcenv = PVE::RPCEnvironment->init('cli');
-           $rpcenv->init_request() if !$no_init;
-           $rpcenv->set_language($ENV{LANG});
-           $rpcenv->set_user('root@pam');
-       }
     }
 
     no strict 'refs';