[pve-devel] r5277 - in pve-manager/trunk: . debian www/root/vmlist
svn-commits at proxmox.com
svn-commits at proxmox.com
Wed Oct 20 11:30:30 CEST 2010
Author: dietmar
Date: 2010-10-20 09:30:30 +0000 (Wed, 20 Oct 2010)
New Revision: 5277
Modified:
pve-manager/trunk/configure.in
pve-manager/trunk/debian/changelog.Debian
pve-manager/trunk/www/root/vmlist/create.htm
Log:
Modified: pve-manager/trunk/configure.in
===================================================================
--- pve-manager/trunk/configure.in 2010-10-20 08:30:09 UTC (rev 5276)
+++ pve-manager/trunk/configure.in 2010-10-20 09:30:30 UTC (rev 5277)
@@ -4,7 +4,7 @@
prefix=/usr
-PACKAGERELEASE=6
+PACKAGERELEASE=7
AC_SUBST(PACKAGERELEASE)
REPOID=`svnversion .`
Modified: pve-manager/trunk/debian/changelog.Debian
===================================================================
--- pve-manager/trunk/debian/changelog.Debian 2010-10-20 08:30:09 UTC (rev 5276)
+++ pve-manager/trunk/debian/changelog.Debian 2010-10-20 09:30:30 UTC (rev 5277)
@@ -1,3 +1,9 @@
+pve-manager (1.6-7) unstable; urgency=low
+
+ * fix for previous change - really query remote host.
+
+ -- Proxmox Support Team <support at proxmox.com> Wed, 20 Oct 2010 11:27:26 +0200
+
pve-manager (1.6-6) unstable; urgency=low
* on the create VM page, query capabilities of remote host (kvm/openvz
Modified: pve-manager/trunk/www/root/vmlist/create.htm
===================================================================
--- pve-manager/trunk/www/root/vmlist/create.htm 2010-10-20 08:30:09 UTC (rev 5276)
+++ pve-manager/trunk/www/root/vmlist/create.htm 2010-10-20 09:30:30 UTC (rev 5277)
@@ -24,21 +24,21 @@
my $conn = PVE::ConfigClient::connect ($udat{auth_cookie});
- my $status = $conn->ping()->result;
my $vzlist = $conn->cluster_vzlist()->result;
- my $kvmversion = $status->{kvmversion};
- my $has_openvz = $status->{openvz};
- my $cpuinfo = $status->{cpuinfo};
my $resolvconf = PVE::Config::read_file ('resolvconf');
my $vmops = PVE::Config::read_file ("vmops");
-
my $rconn = $conn;
if ($fdat{hostcid} != $cinfo->{local}->{cid}) {
$rconn = PVE::ConfigClient::connect ($udat{auth_cookie}, $cinfo, $fdat{hostcid});
}
+ my $status = $rconn->ping()->result;
+ my $kvmversion = $status->{kvmversion};
+ my $has_openvz = $status->{openvz};
+ my $cpuinfo = $status->{cpuinfo};
+
my $stinfo = $rconn->storage_user_info ()->result;
my $stcfg = $stinfo->{cfg};
@@ -176,7 +176,7 @@
my $out = '';
if (!$has_openvz) {
- my $msg = __("This system do not have OpenVZ in the kernel.");
+ my $msg = __("This host does not have OpenVZ in the kernel.");
$out .= PVE::HTMLUtils::create_noteframe (__("Attention"), $msg);
$out .= "<br>\n";
}
More information about the pve-devel
mailing list