Hello community,
here is the log from the commit of package yast2-vm
checked in at Thu Dec 7 21:44:40 CET 2006.
--------
--- arch/i386/yast2-vm/yast2-vm.changes 2006-11-16 22:37:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-vm/yast2-vm.changes 2006-12-06 23:30:34.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 6 15:16:51 MST 2006 - carnold@novell.com
+
+- Yast2-vm does not remove the directory that contains the vm disk
+ image when deleting a vm. (#221258)
+- Yast2-vm doesn't recognize an installation source set up as an
+ ISO file over NFS. (#224798)
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.14.2.tar.bz2
New:
----
yast2-vm-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.cDLazP/_old 2006-12-07 21:44:27.000000000 +0100
+++ /var/tmp/diff_new_pack.cDLazP/_new 2006-12-07 21:44:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.14.2)
+# spec file for package yast2-vm (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.14.2
+Version: 2.15.0
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.14.2.tar.bz2
+Source0: yast2-vm-2.15.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -34,7 +34,7 @@
Michael G. Fritch
%prep
-%setup -n yast2-vm-2.14.2
+%setup -n yast2-vm-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,11 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Wed Dec 06 2006 - carnold@novell.com
+- Yast2-vm does not remove the directory that contains the vm disk
+ image when deleting a vm. (#221258)
+- Yast2-vm doesn't recognize an installation source set up as an
+ ISO file over NFS. (#224798)
* Thu Nov 16 2006 - carnold@novell.com
- yast2-vm acquires package from the wrong install source when a
second source is specified for additional vm installs. (#217403)
++++++ yast2-vm-2.14.2.tar.bz2 -> yast2-vm-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/VERSION new/yast2-vm-2.15.0/VERSION
--- old/yast2-vm-2.14.2/VERSION 2006-11-16 22:28:11.000000000 +0100
+++ new/yast2-vm-2.15.0/VERSION 2006-12-06 23:14:57.000000000 +0100
@@ -1 +1 @@
-2.14.2
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/src/VM_XEN.ycp new/yast2-vm-2.15.0/src/VM_XEN.ycp
--- old/yast2-vm-2.14.2/src/VM_XEN.ycp 2006-11-16 22:25:30.000000000 +0100
+++ new/yast2-vm-2.15.0/src/VM_XEN.ycp 2006-12-06 23:26:55.000000000 +0100
@@ -3,12 +3,13 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 34035 2006-11-04 00:38:38Z mgfritch $
+ * $Id: VM_XEN.ycp 34834 2006-12-06 22:26:51Z mgfritch $
*/
{
module "VM_XEN";
import "VM_Common";
+ import "URL";
import "Popup";
import "Report";
import "HTML";
@@ -128,6 +129,9 @@
if (VM_Common::GetCustomKernel()) {
isNetWare = VM_Common::IsNetWareKernel(VM_Common::GetKernelImage());
}
+ if ( Arch::x86_64() ) {
+ VM_Common::memory_size = 512; // Default to 512 on 64 bit
+ }
if (isNetWare && VM_Common::proposal_type != "install") {
if (VM_Common::memory_size < 512) {
VM_Common::memory_size = 512; // if NetWare, increase the memory_size=512
@@ -1871,6 +1875,28 @@
{
map general_data = Pkg::SourceGeneralData (VM_Common::source_id);
url = general_data["url"]:"";
+ map parsed_url = URL::Parse(url);
+
+ // For when an ISO is mapped as an installation source via nfs
+ if ( parsed_url["scheme"]:"" == "iso" ) {
+ if (regexpmatch(parsed_url["query"]:"", "&url=")) {
+ integer pos1 = search(url, "iso=");
+ integer pos2 = search(url, "url=");
+ if ( pos1 > 0 && pos2 > 0 ) {
+ pos2 = pos2 + 4; // Move past url=
+ string new_url = substring (url, pos2);
+ pos1 = pos1 + 4; // Move past iso=
+ pos2 = (pos2 - 5) - pos1; // Calculate length of iso name
+ string new_iso = substring (url, pos1, pos2);
+ if (findlastof(new_url, "/") < size(new_url)-1) {
+ url = new_url + "/" + new_iso;
+ }
+ else {
+ url = new_url + new_iso;
+ }
+ }
+ }
+ }
}
else if (VM_Common::inst_type == `network_custom) {
url = VM_Common::custom_source;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/src/inst_vm_manage.ycp new/yast2-vm-2.15.0/src/inst_vm_manage.ycp
--- old/yast2-vm-2.14.2/src/inst_vm_manage.ycp 2006-11-16 22:25:30.000000000 +0100
+++ new/yast2-vm-2.15.0/src/inst_vm_manage.ycp 2006-12-01 16:29:26.000000000 +0100
@@ -83,7 +83,7 @@
});
// remove any autoyast.img files from the vm image directory
- string img_dir = VM::GetImgPrefix() + VM_Common::config_name;
+ string img_dir = VM::GetImgPrefix() + item["cfg_file"]:"";
SCR::Execute(.target.remove, img_dir + "/autoyast.img");
// try to remove the vm image directory (if it is not empty, it should not be deleted).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.14.2/src/inst_vm_source.ycp new/yast2-vm-2.15.0/src/inst_vm_source.ycp
--- old/yast2-vm-2.14.2/src/inst_vm_source.ycp 2006-11-16 22:25:30.000000000 +0100
+++ new/yast2-vm-2.15.0/src/inst_vm_source.ycp 2006-12-06 23:26:55.000000000 +0100
@@ -6,7 +6,7 @@
*
* Purpose: Ask the user for installation source for the virtual machine.
*
- * $Id: inst_vm_source.ycp 32678 2006-09-01 22:23:11Z mgfritch $
+ * $Id: inst_vm_source.ycp 34834 2006-12-06 22:26:51Z mgfritch $
*
*/
{
@@ -36,7 +36,13 @@
map general_data = Pkg::SourceGeneralData (id);
string srcurl = general_data["url"]:"";
map parsed_url = URL::Parse(srcurl);
- if (!URL::Check(srcurl) || parsed_url["host"]:"" == "") {
+ boolean isurl = false;
+
+ if ( parsed_url["scheme"]:"" == "iso" ) {
+ isurl = regexpmatch(parsed_url["query"]:"", "&url=");
+ }
+
+ if (!URL::Check(srcurl) || (parsed_url["host"]:"" == "" && isurl == false)) {
return nil;
}
else {
@@ -654,8 +660,13 @@
}
map parsed_url = URL::Parse(srcurl);
+ boolean isurl = false;
+
+ if ( parsed_url["scheme"]:"" == "iso" ) {
+ isurl = regexpmatch(parsed_url["query"]:"", "&url=");
+ }
- if (!URL::Check(srcurl) || parsed_url["host"]:"" == "")
+ if (!URL::Check(srcurl) || (parsed_url["host"]:"" == "" && isurl == false))
{
// popup error message
Report::Error(_("Entered URL value is not valid."));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org