diff --git a/Makefile b/Makefile index 04b42abb..9093568c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=2.0 PACKAGE=qemu-server -PKGREL=13 +PKGREL=14 DESTDIR= PREFIX=/usr diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 4d561d16..5a280e6c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -138,8 +138,6 @@ mkdir $lock_dir; my $pcisysfs = "/sys/bus/pci"; -my $keymaphash = PVE::Tools::kvmkeymaps(); - my $confdesc = { onboot => { optional => 1, @@ -203,7 +201,7 @@ my $confdesc = { optional => 1, type => 'string', description => "Keybord layout for vnc server. Default is read from the datacenter configuration file.", - enum => [ keys %$keymaphash ], + enum => PVE::Tools::kvmkeymaplist(), default => 'en-us', }, name => { diff --git a/changelog.Debian b/changelog.Debian index 7b51151a..e4371535 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +qemu-server (2.0-14) unstable; urgency=low + + * use 'da' instead of 'dk' for Danish keyboard (qemu use that name) + + -- Proxmox Support Team Mon, 09 Jan 2012 11:24:40 +0100 + qemu-server (2.0-13) unstable; urgency=low * load vhost_net module