Author: charlesa Date: Tue Jun 5 17:59:26 2007 New Revision: 38297 URL: http://svn.opensuse.org/viewcvs/yast?rev=38297&view=rev Log: Respond when "help" is requested at the command line. (#269913) Prompt for installing graphical tools when running in text mode. (#268510) Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/VM_XEN.ycp trunk/vm/src/xen.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=38297&r1=38296&r2=38297&view=diff ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Tue Jun 5 17:59:26 2007 @@ -1 +1 @@ -2.15.4 +2.16.1 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=38297&r1=38296&r2=38297&view=diff ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Tue Jun 5 17:59:26 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 5 09:57:06 MDT 2007 - carnold@novell.com + +- Respond when "help" is requested at the command line. (#269913) +- Prompt for installing graphical tools when running in text mode. + (#268510) + +------------------------------------------------------------------- Mon May 21 08:29:37 MDT 2007 - carnold@novell.com - The 'Virtualization' category is missing and the virtualization Modified: trunk/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=38297&r1=38296&r2=38297&view=diff ============================================================================== --- trunk/vm/src/VM_XEN.ycp (original) +++ trunk/vm/src/VM_XEN.ycp Tue Jun 5 17:59:26 2007 @@ -181,8 +181,13 @@ list<string> packages = ["xen", "xen-libs", "xen-tools", "xen-tools-ioemu"]; packages = add(packages, kernel_pkg); + boolean inst_gui = true; + // Assume python gtk is installed. If in text mode we don't care - if (UI::GetDisplayInfo()["TextMode"]:true == false) { + if (UI::GetDisplayInfo()["TextMode"]:true == true) { + inst_gui = Popup::YesNo (_("Running in text mode. Install graphical components anyway?")); + } + if ( inst_gui == true ) { packages = add(packages, "python-gtk"); // Also make sure virt-manager is there - runs GUI only packages = add(packages, "virt-manager"); Modified: trunk/vm/src/xen.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.ycp?rev=38297&r1=38296&r2=38297&view=diff ============================================================================== --- trunk/vm/src/xen.ycp (original) +++ trunk/vm/src/xen.ycp Tue Jun 5 17:59:26 2007 @@ -41,6 +41,7 @@ import "Arch"; + import "CommandLine"; import "Mode"; import "Package"; import "Popup"; @@ -66,38 +67,24 @@ return ret; } + /* Main */ -/* boolean GUIHandler() { - - // Assume python gtk is installed. If in text mode we don't care - if (UI::GetDisplayInfo()["TextMode"]:true == false) { - // FIXME: do we want to launch the GUI??? - // start the Xen VM install GUI - //string cmd = "/usr/sbin/xen-vm-install"; - //y2milestone("Executing: %1", cmd); - //integer ret = (integer)SCR::Execute(.target.bash_background, cmd); - //y2milestone("GUIHandler returned: %1", (ret == 0)); - //return (ret == 0); - } - - return true; - } -*/ + /** + * Definition of command line mode options + */ + map cmdline = $[ + "id" : "vm", + "help" : _("Install Hypervisor and Tools"), + "guihandler" : CheckConfiguration + ]; - /* Main */ + any rc = CommandLine::Run(cmdline); + y2milestone("YAST2-VM: rc = %1", rc); // Always check the dom0 configuration - boolean ret = CheckConfiguration(); - if (ret == false) return `abort; - - // only start the GUI if we are running Xen kernel - /* if (Arch::is_xen()) { - ret = GUIHandler(); - if (ret == false) return `abort; - } -*/ - +// boolean ret = CheckConfiguration(); +// if (ret == false) return `abort; /* Finish */ y2milestone("Xen (yast-vm) module finished"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org