proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-12-16 11:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correctly set exit code

Browse Source
This commit is contained in:
Dietmar Maurer 2011-11-30 09:34:38 +01:00
parent 02d07cf579
commit 2372d11498
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=qemu-server PACKAGE=qemu-server
PKGREL=9 PKGREL=10
DESTDIR= DESTDIR=
PREFIX=/usr PREFIX=/usr

8
changelog.Debian
View File

@ -1,3 +1,11 @@
qemu-server (2.0-10) unstable; urgency=low
* set qm exit codes currectly
* fix 'qm shutdown <vmid>'
-- Proxmox Support Team <support@proxmox.com> Wed, 30 Nov 2011 09:35:43 +0100
qemu-server (2.0-9) unstable; urgency=low qemu-server (2.0-9) unstable; urgency=low
* fix 'qm stopall' * fix 'qm stopall'

29
qm
View File

@ -35,6 +35,12 @@ $rpcenv->init_request();
$rpcenv->set_language($ENV{LANG}); $rpcenv->set_language($ENV{LANG});
$rpcenv->set_user('root@pam'); $rpcenv->set_user('root@pam');
my $upid_exit = sub {
my $upid = shift;
my $status = PVE::Tools::upid_read_status($upid);
exit($status eq 'OK' ? 0 : -1);
};
my $nodename = PVE::INotify::nodename(); my $nodename = PVE::INotify::nodename();
sub run_vnc_proxy { sub run_vnc_proxy {
@ -385,16 +391,11 @@ my $cmddef = {
} ], } ],
create => [ "PVE::API2::Qemu", 'create_vm', ['vmid'], { node => $nodename } ], create => [ "PVE::API2::Qemu", 'create_vm', ['vmid'], { node => $nodename }, $upid_exit ],
destroy => [ "PVE::API2::Qemu", 'destroy_vm', ['vmid'], { node => $nodename } ], destroy => [ "PVE::API2::Qemu", 'destroy_vm', ['vmid'], { node => $nodename }, $upid_exit ],
migrate => [ "PVE::API2::Qemu", 'migrate_vm', ['target', 'vmid'], { node => $nodename }, migrate => [ "PVE::API2::Qemu", 'migrate_vm', ['target', 'vmid'], { node => $nodename }, $upid_exit ],
sub {
my $upid = shift;
my $status = PVE::Tools::upid_read_status($upid);
exit($status eq 'OK' ? 0 : -1);
}],
set => [ "PVE::API2::Qemu", 'update_vm', ['vmid'], { node => $nodename } ], set => [ "PVE::API2::Qemu", 'update_vm', ['vmid'], { node => $nodename } ],
@ -417,17 +418,17 @@ my $cmddef = {
status => [ __PACKAGE__, 'status', ['vmid']], status => [ __PACKAGE__, 'status', ['vmid']],
start => [ "PVE::API2::Qemu", 'vm_start', ['vmid'], { node => $nodename } ], start => [ "PVE::API2::Qemu", 'vm_start', ['vmid'], { node => $nodename } , $upid_exit ],
stop => [ "PVE::API2::Qemu", 'vm_stop', ['vmid'], { node => $nodename } ], stop => [ "PVE::API2::Qemu", 'vm_stop', ['vmid'], { node => $nodename }, $upid_exit ],
reset => [ "PVE::API2::Qemu", 'vm_reset', ['vmid'], { node => $nodename } ], reset => [ "PVE::API2::Qemu", 'vm_reset', ['vmid'], { node => $nodename }, $upid_exit ],
shutdown => [ "PVE::API2::Qemu", 'vm_shutdown', ['vmid'], { node => $nodename } ], shutdown => [ "PVE::API2::Qemu", 'vm_shutdown', ['vmid'], { node => $nodename }, $upid_exit ],
suspend => [ "PVE::API2::Qemu", 'vm_suspend', ['vmid'], { node => $nodename } ], suspend => [ "PVE::API2::Qemu", 'vm_suspend', ['vmid'], { node => $nodename }, $upid_exit ],
resume => [ "PVE::API2::Qemu", 'vm_resume', ['vmid'], { node => $nodename } ], resume => [ "PVE::API2::Qemu", 'vm_resume', ['vmid'], { node => $nodename }, $upid_exit ],
sendkey => [ "PVE::API2::Qemu", 'vm_sendkey', ['vmid', 'key'], { node => $nodename } ], sendkey => [ "PVE::API2::Qemu", 'vm_sendkey', ['vmid', 'key'], { node => $nodename } ],