From c59334cb0056c4640809498282e38ffaca864a96 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 9 Jan 2012 11:49:17 +0100 Subject: [PATCH] use new helper PVE::Tools::kvmkeymaplist() --- Makefile | 2 +- data/PVE/Cluster.pm | 3 +-- debian/changelog | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dd361c9..f9bbd76 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.0 PACKAGE=pve-cluster PKGVER=1.0 -PKGREL=18 +PKGREL=19 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm index 14efcec..e5ac0ad 100644 --- a/data/PVE/Cluster.pm +++ b/data/PVE/Cluster.pm @@ -1183,7 +1183,6 @@ sub ssh_merge_known_hosts { } -my $keymaphash = PVE::Tools::kvmkeymaps(); my $datacenter_schema = { type => "object", additionalProperties => 0, @@ -1192,7 +1191,7 @@ my $datacenter_schema = { optional => 1, type => 'string', description => "Default keybord layout for vnc server.", - enum => [ keys %$keymaphash ], + enum => PVE::Tools::kvmkeymaplist(), }, language => { optional => 1, diff --git a/debian/changelog b/debian/changelog index 8418ea6..96e33ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pve-cluster (1.0-19) unstable; urgency=low + + * use new helper PVE::Tools::kvmkeymaplist() + + -- Proxmox Support Team Mon, 09 Jan 2012 11:39:19 +0100 + pve-cluster (1.0-18) unstable; urgency=low * fix database load bug. -- 2.39.2