commit vm-install

29 Feb 2008

Hello community,

here is the log from the commit of package vm-install
checked in at Sat Mar 1 00:08:35 CET 2008.

--------

--- vm-install/vm-install.changes	2008-02-01 21:14:50.000000000 +0100
+++ vm-install/vm-install.changes	2008-02-29 23:48:40.224246000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 29 23:48:21 CET 2008 - carnold@suse.de
+
+- Support for pxe booting fully virtualized guests in vm-install is
+  complete.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.n20067/_old	2008-03-01 00:07:53.000000000 +0100
+++ /var/tmp/diff_new_pack.n20067/_new	2008-03-01 00:07:53.000000000 +0100
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           vm-install
 Url:            http://developer.novell.com/wiki/index.php/Vm-install
 BuildRequires:  python-devel update-desktop-files
@@ -19,7 +20,7 @@
 Group:          System/Emulators/PC
 AutoReqProv:    yes
 Version:        0.2.3
-Release:        1
+Release:        20
 Summary:        Tool to Define a Virtual Machine and Install Its Operating System
 Source0:        %{name}-0.2.3.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -77,6 +78,9 @@
 %{_datadir}/applications/YaST2/vm-install.desktop
 
 %changelog
+* Sat Mar 01 2008 carnold@suse.de
+- Support for pxe booting fully virtualized guests in vm-install is
+  complete.
 * Fri Feb 01 2008 carnold@suse.de
 - Update version to 0.2.3
 - Add support for selecting PXE boot as installation source.

++++++ vm-install-0.2.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/bin/vm-install new/vm-install-0.2.3/bin/vm-install
--- old/vm-install-0.2.3/bin/vm-install	2008-01-29 22:12:43.000000000 +0100
+++ new/vm-install-0.2.3/bin/vm-install	2008-02-29 22:50:40.000000000 +0100
@@ -104,6 +104,8 @@
                       help="additional arguments for the paravirtualized kernel")
     parser.add_option('-s', '--source', type='string', dest='source',
                       help="URL of installation source for paravirtualized VM")
+    parser.add_option('-p', '--pxe-boot', action="store_true", dest="pxe_boot",
+                      help="Specify PXE booting for the fully virtualized VM")
 
     parser.add_option('', '--background', action='store_true', dest='background',
                       help="run as background job; do not prompt")
@@ -149,7 +151,6 @@
     try:
         populate_options(options)
         vminstall.options.calculate(options, defaults)
-
         job = vminstall.job.Job(background=defaults.background, debug=defaults.debug)
 
         interface = None
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/src/vminstall/FullVirtGuest.py new/vm-install-0.2.3/src/vminstall/FullVirtGuest.py
--- old/vm-install-0.2.3/src/vminstall/FullVirtGuest.py	2008-01-19 00:03:46.000000000 +0100
+++ new/vm-install-0.2.3/src/vminstall/FullVirtGuest.py	2008-02-27 22:47:07.000000000 +0100
@@ -87,14 +87,14 @@
 
     def GetConfigXen(self):
         if self.isInstall:
-            if type(self.options.source) is Disk:
-                if self.options.source.vdevtype == Disk.DEVICE_DISK:
-                    bootdev = 'c'
-                else:
-                    bootdev = 'd'
+            if self.options.pxe_boot:
+                bootdev = 'n'
             else:
-                if self.options.pxe_boot:
-                    bootdev = 'n'
+                if type(self.options.source) is Disk:
+                    if self.options.source.vdevtype == Disk.DEVICE_DISK:
+                        bootdev = 'c'
+                    else:
+                        bootdev = 'd'
                 else:
                     bootdev = 'd'
         else:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/src/vminstall/gtk/interface.py new/vm-install-0.2.3/src/vminstall/gtk/interface.py
--- old/vm-install-0.2.3/src/vminstall/gtk/interface.py	2008-02-01 18:35:24.000000000 +0100
+++ new/vm-install-0.2.3/src/vminstall/gtk/interface.py	2008-02-15 22:05:30.000000000 +0100
@@ -1040,6 +1040,8 @@
         elif page_num == self.pages['method']:
             full_virt = not self.window.get_widget('virt-method-pv').get_active()
             self.options.full_virt = full_virt
+            if not self.options.full_virt:
+                self.options.pxe_boot = False
         elif page_num == self.pages['name']:
             name = self.window.get_widget('create-vm-name').get_text()
             self.options.name = name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/src/vminstall/options.py new/vm-install-0.2.3/src/vminstall/options.py
--- old/vm-install-0.2.3/src/vminstall/options.py	2008-01-18 23:57:34.000000000 +0100
+++ new/vm-install-0.2.3/src/vminstall/options.py	2008-02-15 21:59:24.000000000 +0100
@@ -240,7 +240,13 @@
         defaults.os_type = default_os_type
     vmdefaults = VMDefaults[defaults.os_type]
 
-    defaults.full_virt = defaults.full_preferred(options.full_virt)
+    if options.pxe_boot:
+        log.debug("using pxe boot, defaulting to full virtualization")
+        defaults.pxe_boot = options.pxe_boot
+        defaults.full_virt = True
+    else:
+        defaults.pxe_boot = False
+        defaults.full_virt = defaults.full_preferred(options.full_virt)
 
     if options.name:
         defaults.name = options.name
@@ -450,11 +456,6 @@
     # Now give the OS a chance to voice its opinion:
     vmdefaults.actions().preprocessOptions(defaults)
 
-    if options.pxe_boot:
-        defaults.pxe_boot = options.pxe_boot
-    else:
-        defaults.pxe_boot = False
-
     log.debug("end recalculation")
 
 def finalize(options):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/src/vminstall/svn-commit.tmp new/vm-install-0.2.3/src/vminstall/svn-commit.tmp
--- old/vm-install-0.2.3/src/vminstall/svn-commit.tmp	2007-10-18 23:48:18.000000000 +0200
+++ new/vm-install-0.2.3/src/vminstall/svn-commit.tmp	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-Bug 334933 - SLES 9 virtualization mode should default
-to paravirtualization with sles9sp4.
-
---This line, and those below, will be ignored--
-
-M    VMDefaults.py
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/src/vminstall/text/interface.py new/vm-install-0.2.3/src/vminstall/text/interface.py
--- old/vm-install-0.2.3/src/vminstall/text/interface.py	2008-01-29 22:13:58.000000000 +0100
+++ new/vm-install-0.2.3/src/vminstall/text/interface.py	2008-02-12 19:43:29.000000000 +0100
@@ -207,6 +207,11 @@
     else:
         full_virt = defaults.full_virt
     options.full_virt = full_virt
+    if options.full_virt:
+        output(vminstall.msg.PXE_boot + '\n')
+        if prompt_yes_no('', False):
+            options.pxe_boot = True
+            output('\n')
 
 def get_name():
     if options.name:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.3/src/vminstall/VMDefaults.py new/vm-install-0.2.3/src/vminstall/VMDefaults.py
--- old/vm-install-0.2.3/src/vminstall/VMDefaults.py	2008-02-01 19:38:22.000000000 +0100
+++ new/vm-install-0.2.3/src/vminstall/VMDefaults.py	2008-02-29 23:17:50.000000000 +0100
@@ -101,6 +101,9 @@
         return 256
     def auto_install(self):
         return msg.kickstart_desc
+    def apic(self):
+        # RHEL3 64bit needs this.  Slows down 32bit:(
+        return True
 
 # https://www.redhat.com/rhel/details/limits/
 class RHEL3Defaults(RedHatDefaults):
@@ -108,9 +111,6 @@
         return msg.rhel3
     def virt_support(self):
         return ('hvm')
-    def apic(self):
-        # RHEL3 64bit needs this.  Slows down 32bit:(
-        return True
     def max_cpus(self):
         return 16
     def min_memory(self):
@@ -203,6 +203,8 @@
         return True
     def num_vcpus(self):
         return caps.vcpu_processors(2);
+    def apic(self):
+        return True
 
 class SLES10Defaults(SUSEDefaults):
     def name(self):
@@ -211,6 +213,8 @@
         return 512
     def num_vcpus(self):
         return caps.vcpu_processors(4);
+    def apic(self):
+        return True
 
 class NetWareDefaults(GenericDefaults):
     def group(self):
@@ -312,15 +316,17 @@
         return msg.windows_xp
     def num_vcpus(self):
         return caps.vcpu_processors(2);
+    def apic(self):
+        return True
 class WindowsXPx64Defaults(WindowsDefaults):
     def name(self):
         return msg.windows_xp_x64
     def default_memory(self):
         return 512
-    def apic(self):
-        return True
     def num_vcpus(self):
         return caps.vcpu_processors(2);
+    def apic(self):
+        return True
 class WindowsVistaDefaults(WindowsDefaults):
     def name(self):
         return msg.windows_vista
@@ -334,11 +340,11 @@
         return [ self._disk_template(0, self._disk_size()) ]
     def num_vcpus(self):
         return caps.vcpu_processors(2);
+    def apic(self):
+        return True
 class WindowsVistax64Defaults(WindowsVistaDefaults):
     def name(self):
         return msg.windows_vista_x64
-    def apic(self):
-        return True
 class WindowsServer2008Defaults(WindowsDefaults):
     def name(self):
         return msg.windows_server_2008
@@ -357,11 +363,11 @@
         return True
     def num_vcpus(self):
         return caps.vcpu_processors(4);
+    def apic(self):
+        return True
 class WindowsServer2008x64Defaults(WindowsServer2008Defaults):
     def name(self):
         return msg.windows_server_2008_x64
-    def apic(self):
-        return True
 
 class Solaris9Defaults(GenericDefaults):
     def group(self):
@@ -377,6 +383,8 @@
         return 128
     def num_vcpus(self):
         return caps.vcpu_processors(4);
+    def apic(self):
+        return True
 # FIXME:  learn about this...
 #    def auto_install(self):
 #        return "JumpStart"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)