Author: jdsn Date: Wed Nov 12 00:16:59 2008 New Revision: 53183 URL: http://svn.opensuse.org/viewcvs/yast?rev=53183&view=rev Log: only disable X11 cloning during installation (bnc#439612) Modified: trunk/x11/package/yast2-x11.changes trunk/x11/src/autoyast/modules/AutoinstX11.ycp trunk/x11/src/autoyast/proposal/x11_auto.ycp Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=53183&r1=53182&r2=53183&view=diff ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Wed Nov 12 00:16:59 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 11 23:32:05 CET 2008 - jdsn@suse.de + +- only disable X11 cloning during installation (bnc#439612) + +------------------------------------------------------------------- Fri Nov 7 02:27:35 CET 2008 - jdsn@suse.de - fix deadlock in x11 dialogs (bnc#440281) Modified: trunk/x11/src/autoyast/modules/AutoinstX11.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/modules/AutoinstX11.ycp?rev=53183&r1=53182&r2=53183&view=diff ============================================================================== --- trunk/x11/src/autoyast/modules/AutoinstX11.ycp (original) +++ trunk/x11/src/autoyast/modules/AutoinstX11.ycp Wed Nov 12 00:16:59 2008 @@ -12,6 +12,8 @@ import "Summary"; import "Directory"; import "XLib"; +import "Arch"; +import "Mode"; //======================================= // Globals @@ -27,6 +29,27 @@ global list models = []; global list<map> all_monitors = []; + +//======================================= +// autoyastX11Allowed +// +// disable autoYaST functionality (currently in Read and Export) +//--------------------------------------- +global boolean autoyastX11Allowed () +{ + // on Itanium during installation no X11 cloning should be performed (bnc#439612) + if ( Arch::ia64() && Mode::mode() == "installation" ) + { + y2warning("On Itanium (ia64) during installation no cloning of the X11 configuration is supported."); + y2warning("X11 will return an empty configuration now."); + y2warning("You can however create a clone config including X11 within the running system."); + return false; + } + + return true; +} + + //======================================= // SetModified //--------------------------------------- @@ -57,6 +80,8 @@ // Export //--------------------------------------- global define map Export () { + if ( ! autoyastX11Allowed() ) { return $[]; } + monitor["display"] = display; monitor["monitor_device"] = current_model; monitor["monitor_vendor"] = current_vendor; @@ -128,6 +153,8 @@ // Read //--------------------------------------- global define boolean Read() { + if ( ! autoyastX11Allowed() ) { return true; } + x11["display_manager"] = (string) eval (SCR::Read( .sysconfig.displaymanager.DISPLAYMANAGER )); Modified: trunk/x11/src/autoyast/proposal/x11_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/proposal/x11_auto.ycp?rev=53183&r1=53182&r2=53183&view=diff ============================================================================== --- trunk/x11/src/autoyast/proposal/x11_auto.ycp (original) +++ trunk/x11/src/autoyast/proposal/x11_auto.ycp Wed Nov 12 00:16:59 2008 @@ -25,7 +25,6 @@ textdomain "x11"; import "AutoinstX11"; -import "Arch"; include "x11/autoDialog.ycp"; @@ -49,18 +48,11 @@ y2debug("func=%1", func); y2debug("param=%1", param); -//================================= -// check if this hardware supports X11 configuration (bnc#439612) -//--------------------------------- -if ( ! Arch::x11_setup_needed() ) { - y2milestone("On this architecture no automatic X11 setup is supported. Thus no autoYaST configuration will be created or written."); - ret = false; -} //================================= // Import configuration //--------------------------------- -else if (func == "Import") { +if (func == "Import") { ret = AutoinstX11::Import(param); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org