Author: jdsn Date: Wed Nov 19 21:51:51 2008 New Revision: 53462 URL: http://svn.opensuse.org/viewcvs/yast?rev=53462&view=rev Log: no x11 configuration only without a graphics device (bnc#431522) fix sax call to set tablet (bnc#445422) Modified: trunk/x11/package/yast2-x11.changes trunk/x11/src/XLib.pm trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=53462&r1=53461&r2=53462&view=diff ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Wed Nov 19 21:51:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 19 21:49:04 CET 2008 - jdsn@suse.de + +- no x11 configuration only without a graphics device (bnc#431522) +- fix sax call to set tablet (bnc#445422) + +------------------------------------------------------------------- Tue Nov 18 17:57:09 CET 2008 - jdsn@suse.de - prevent sax to switch to interactive mode (bnc#430600) Modified: trunk/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XLib.pm?rev=53462&r1=53461&r2=53462&view=diff ============================================================================== --- trunk/x11/src/XLib.pm (original) +++ trunk/x11/src/XLib.pm Wed Nov 19 21:51:51 2008 @@ -978,7 +978,8 @@ my $mTablet = new SaX::SaXManipulateTablets ( $section{Pointers},$section{Layout} ); - $mTablet->setTablet($vendor, $model); + # only call the wrapper function of the sax api (bnc#445422) + $mTablet->setTablet("$vendor:$model"); } Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.ycp?rev=53462&r1=53461&r2=53462&view=diff ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Wed Nov 19 21:51:51 2008 @@ -43,6 +43,30 @@ map ret = $[]; //========================================== +// Check for graphics device // (bnc#431522) +//------------------------------------------ +if ( (integer)SCR::Execute(.target.bash, "/sbin/lspci -n | cut -f 2 -d \" \" | grep -q \"0300\"") == 0 ) +{ + y2milestone("Detected a graphics device: A PCI device exists with ClassID 0300."); + y2milestone("X11 configuration will be performed."); +} +else +{ + y2milestone("No PCI device exists with ClassID 0300."); + y2milestone("Now checking for a framebuffer device."); + + if ( (integer)SCR::Execute(.target.bash, "[ -f /proc/fb ]") == 0 ) + { + y2milestone("Found a framebuffer device. X11 configuration will be perfomed."); + } + else + { + y2error("Neither a PCI device with ClassID 0300 nor a framebuffer device was found."); + y2error("X11 configuration will not be performed now."); + return $[]; + } +} +//========================================== // Check for installed packages... //------------------------------------------ if ( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org