[pve-devel] r5307 - in pve-manager/trunk: . debian www/root/vmlist

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-11-11 06:08:28 +0000 (Thu, 11 Nov 2010)
New Revision: 5307

Modified:
   pve-manager/trunk/ChangeLog
   pve-manager/trunk/configure.in
   pve-manager/trunk/debian/changelog.Debian
   pve-manager/trunk/www/root/vmlist/create.htm
Log:


Modified: pve-manager/trunk/ChangeLog
===================================================================
--- pve-manager/trunk/ChangeLog	2010-11-10 08:34:10 UTC (rev 5306)
+++ pve-manager/trunk/ChangeLog	2010-11-11 06:08:28 UTC (rev 5307)
@@ -1,3 +1,8 @@
+2010-11-11  Proxmox Support Team  <support at proxmox.com>
+
+	* www/root/vmlist/create.htm: we only display the warning about
+	missing openvz if we have no kvm.
+
 2010-11-03  Proxmox Support Team  <support at proxmox.com>
 
 	* bin/pvectl (change_veconfig): fix comparison of undefined

Modified: pve-manager/trunk/configure.in
===================================================================
--- pve-manager/trunk/configure.in	2010-11-10 08:34:10 UTC (rev 5306)
+++ pve-manager/trunk/configure.in	2010-11-11 06:08:28 UTC (rev 5307)
@@ -4,7 +4,7 @@
 
 prefix=/usr
 
-PACKAGERELEASE=8
+PACKAGERELEASE=9
 AC_SUBST(PACKAGERELEASE)
 
 REPOID=`svnversion .`

Modified: pve-manager/trunk/debian/changelog.Debian
===================================================================
--- pve-manager/trunk/debian/changelog.Debian	2010-11-10 08:34:10 UTC (rev 5306)
+++ pve-manager/trunk/debian/changelog.Debian	2010-11-11 06:08:28 UTC (rev 5307)
@@ -1,3 +1,9 @@
+pve-manager (1.6-9) unstable; urgency=low
+
+  *  we only display the warning about missing openvz if we have no kvm.
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 11 Nov 2010 07:05:41 +0100
+
 pve-manager (1.6-8) unstable; urgency=low
 
   * fix config change detection in pvectl

Modified: pve-manager/trunk/www/root/vmlist/create.htm
===================================================================
--- pve-manager/trunk/www/root/vmlist/create.htm	2010-11-10 08:34:10 UTC (rev 5306)
+++ pve-manager/trunk/www/root/vmlist/create.htm	2010-11-11 06:08:28 UTC (rev 5307)
@@ -175,12 +175,6 @@
 
  my $out = '';
 
- if (!$has_openvz) {
-   my $msg = __("This host does not have OpenVZ in the kernel.");
-   $out .= PVE::HTMLUtils::create_noteframe (__("Attention"), $msg);
-   $out .= "<br>\n";
- }
-
  my $has_hvm = $cpuinfo->{hvm};
  if (!$cpuinfo->{hvm}) {
    my $msg = __("This CPU does not support KVM virtual machines (no Intel VT / AMD-V support).");
@@ -193,6 +187,14 @@
    $has_hvm = 0;
  }
 
+ # we only display the warning about missing openvz if we have also no kvm
+ if (!$has_openvz && !$has_hvm) {
+   my $msg = __("This host does not have OpenVZ in the kernel.");
+   $out .= PVE::HTMLUtils::create_noteframe (__("Attention"), $msg);
+   $out .= "<br>\n";
+ }
+
+
  my $nextveid = PVE::Cluster::get_nextid($vzlist, $vmops);
 
  my $cidlist = PVE::HTMLUtils::cluster_format_cid_list ($cinfo);