Author: charlesa Date: Wed Aug 3 22:45:11 2011 New Revision: 65178 URL: http://svn.opensuse.org/viewcvs/yast?rev=65178&view=rev Log: Update SuSE-Code-11-SP1-Branch with the correct version and source of yast2-vm that should be found in sles11sp1. Modified: branches/SuSE-Code-11-SP1-Branch/vm/VERSION branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes branches/SuSE-Code-11-SP1-Branch/vm/src/VM_XEN.ycp branches/SuSE-Code-11-SP1-Branch/vm/src/virtualization.desktop branches/SuSE-Code-11-SP1-Branch/vm/src/xen.desktop branches/SuSE-Code-11-SP1-Branch/vm/src/xen.ycp branches/SuSE-Code-11-SP1-Branch/vm/yast2-vm.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/VERSION?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/VERSION Wed Aug 3 22:45:11 2011 @@ -1 +1 @@ -2.16.11 +2.17.2 Modified: branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes Wed Aug 3 22:45:11 2011 @@ -10,12 +10,36 @@ - bnc#628256 - sysvinit: Id "x0" respawning too fast ------------------------------------------------------------------- +Thu Oct 21 11:20:32 MDT 2010 - carnold@novell.com + +- bnc#647261 - Get lot's of error in .xsession-errors when lauching + yast + +------------------------------------------------------------------- +Wed Dec 2 16:23:55 MST 2009 - carnold@novell.com + +- Add support for installing KVM. + fate#306665 - KVM reaches supported status + bnc#557233 - YaST needs to include kvm in virtualization support + functionality + +------------------------------------------------------------------- Wed Apr 1 09:18:46 MDT 2009 - carnold@novell.com - bnc#488598 - chkconfig and insserv fail on init scripts that depend on /etc/init.d/boot.clock in Xen domU ------------------------------------------------------------------- +Thu Feb 12 13:04:27 CET 2009 - coolo@suse.de + +- add dummy Exec line to the group desktop file to make it validate + +------------------------------------------------------------------- +Fri Jan 9 08:41:58 CET 2009 - olh@suse.de + +- use ExclusiveArch as in /SRC/arch/ + +------------------------------------------------------------------- Wed Nov 12 13:37:57 MST 2008 - carnold@novell.com - bnc#431907 - inst_finish.ycp:233 Client vm_finish returned Modified: branches/SuSE-Code-11-SP1-Branch/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/src/VM_XEN.ycp?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/src/VM_XEN.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/src/VM_XEN.ycp Wed Aug 3 22:45:11 2011 @@ -130,24 +130,6 @@ global boolean ConfigureDom0() { -/* if (Arch::is_xen() == false) { - // error - xen kernel must be running to start a new Xen domain, - // ask user to configure the first (management) Xen domain - if (Popup::YesNo(_("A Xen virtual machine can be started only -from the VM Server (domain 0), -which is not running now. - -Configure the VM Server now?"))) - { - y2milestone("Starting domain0 configuration..."); - } - else - { - y2milestone("Skipping domain0 configuration"); - return false; - } - } -*/ list <string> progress_stages = [ // progress stage 1/2 _("Verify Installed Packages"), @@ -158,6 +140,10 @@ list progress_descriptions = []; boolean bridge_exists = false; + boolean install_xen = false; + boolean install_kvm = false; + any widget_id = nil; + string bridge_path = ""; integer progress_length = size(progress_stages); @@ -177,6 +163,31 @@ // error popup string abortmsg = _("The installation will be aborted."); + // Generate a pop dialog to allow user selection of Xen or KVM + UI::OpenDialog( + `VBox( + `Label(_("Please select the virtualization platform to install")), + `Left(`CheckBox(`id(`xen), "Xen")), + `Left(`CheckBox(`id(`kvm), "KVM")), + `HBox( + `PushButton(`id(`accept), "&Accept" ), + `PushButton(`id(`cancel), "&Cancel" ) + ) + ) + ); + + widget_id = UI::UserInput(); + if ( widget_id == `accept ) { + install_xen = (boolean) UI::QueryWidget(`id(`xen), `Value); + install_kvm = (boolean) UI::QueryWidget(`id(`kvm), `Value); + } + if ( widget_id == `cancel || (install_xen == false && install_kvm == false) ) { + y2milestone("VM_XEN::ConfigureDom0 Cancel Selected or no platform selected."); + return false; + } + + UI::CloseDialog(); + Wizard::OpenNextBackDialog(); // enable progress @@ -188,10 +199,17 @@ // package stage Progress::NextStage(); - string kernel_pkg = "kernel-xen"; + // Common packages to both Xen and KVM (hard dependency in libvirt for xen-libs even if kvm only) + list<string> packages = ["libvirt", "libvirt-python", "xen-libs", "vm-install"]; - list<string> packages = ["xen", "xen-libs", "xen-tools", "vm-install"]; - packages = add(packages, kernel_pkg); + if ( install_xen ) { + packages = add(packages, "xen"); + packages = add(packages, "xen-tools"); + packages = add(packages, "kernel-xen"); + } + if ( install_kvm ) { + packages = add(packages, "kvm"); + } boolean inst_gui = true; @@ -248,10 +266,10 @@ // Popup yes/no dialog if ( bridge_exists == false ) { - if ( Popup::AnyQuestionRichText(_("Xen Network Bridge."), - _("<p>For normal network configurations, xen needs a network bridge.</p><p>Configure a default network bridge?</p>"), + if ( Popup::AnyQuestionRichText(_("Network Bridge."), + _("<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"), 45, 5, Label::YesButton(), Label::NoButton(), `focus_yes) ) { - y2milestone("Configuring default bridge for Xen..."); + y2milestone("Configuring default bridge for Xen or KVM..."); WFM::call("lan_proposal", ["MakeProposal"]); UI::OpenDialog(`VBox()); WFM::call("lan_proposal", ["Write"]); @@ -272,19 +290,38 @@ Progress::Finish(); - if ( Arch::is_xen() == false ) { - // popup message - ask user to reboot the machine into Xen kernel - Popup::LongMessage(_("The machine is ready to start the VM Server. + string message_kvm = _("For installing KVM guests, reboot the machine to load the necessary drivers."); + string message_xen_reboot = _("For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu. +"); + string message_xen_ready = _("Hypervisor and tools are installed."); + string message = nil; -Reboot the machine and select the Xen section in the boot loader menu to start it. -")); + if ( install_xen == false ) { + Popup::LongMessage(message_kvm); } else { - // popup message - Notify user of successful completion (or already installed). - Popup::Message(_("Hypervisor and tools are installed.")); + if ( Arch::is_xen() == false ) { + if ( install_kvm == true ) { + message = sformat("%1\n\n%2", message_kvm, message_xen_reboot); + } + else { + message = message_xen_reboot; + } + // popup message - ask user to reboot the machine + Popup::LongMessage(message); + } + else { + // popup message - Notify user of successful completion (or already installed). + if ( install_kvm == true ) { + message = sformat("%1\n\n%2", message_kvm, message_xen_ready); + } + else { + message = message_xen_ready; + } + Popup::Message(message); + } } - Wizard::CloseDialog(); y2milestone("VM_XEN::ConfigureDom0 returned: %1", success); Modified: branches/SuSE-Code-11-SP1-Branch/vm/src/virtualization.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/src/virtualization.desktop?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/src/virtualization.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/src/virtualization.desktop Wed Aug 3 22:45:11 2011 @@ -1,4 +1,6 @@ [Desktop Entry] +X-SuSE-translate=true +X-SuSE-DocTeamID=ycc_virtualization Type=Application Categories=Settings;System;Qt;X-SuSE-YaST-Virtualization; @@ -14,3 +16,7 @@ Icon=yast-host Name=Virtualization + +Exec=yast2 + + Modified: branches/SuSE-Code-11-SP1-Branch/vm/src/xen.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/src/xen.desktop?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/src/xen.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/src/xen.desktop Wed Aug 3 22:45:11 2011 @@ -1,4 +1,6 @@ [Desktop Entry] +X-SuSE-translate=true +X-SuSE-DocTeamID=ycc_xen Type=Application Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; @@ -22,3 +24,4 @@ GenericName=Install Hypervisor and Tools X-KDE-SubstituteUID=true StartupNotify=true + Modified: branches/SuSE-Code-11-SP1-Branch/vm/src/xen.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/src/xen.ycp?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/src/xen.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/src/xen.ycp Wed Aug 3 22:45:11 2011 @@ -24,7 +24,7 @@ * Summary: Main virtual machine installation/management * Authors: Michael G. Fritch * - * $Id$ + * $Id: xen.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { Modified: branches/SuSE-Code-11-SP1-Branch/vm/yast2-vm.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/yast2-vm.spec.in?rev=65178&r1=65177&r2=65178&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/yast2-vm.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/yast2-vm.spec.in Wed Aug 3 22:45:11 2011 @@ -6,7 +6,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 -Summary: Start installation in a Virtual Machine +Summary: Configure Hypervisor and Tools for Xen and KVM %description - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org