X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FCLIHandler.pm;h=e2a81a0a8c0866051940d15382619676d93e1e27;hp=c448a80ef7828cb2f00f4961bce7c0fcd75cc211;hb=9c07db40e070caeefa4a67d5b9efacceada885db;hpb=b7ef63ab0a93014ab12a91f65fe565ab68201b0e

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index c448a80..e2a81a0 100644
--- 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();
     }
 }
 
@@ -468,11 +473,13 @@ 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';
 	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');
@@ -486,10 +493,12 @@ sub run_cli_handler {
 
 	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');
+	    $rpcenv->init_request() if !$no_init;
+	    $rpcenv->set_language($ENV{LANG});
+	    $rpcenv->set_user('root@pam');
+	}
     }
 
     no strict 'refs';