Mailinglist Archive: yast-commit (459 mails)

[jdsn@xxxxxxxxxxxxxxxx]

Author: jdsn
Date: Thu Feb 18 21:11:11 2010
New Revision: 60861

URL: http://svn.opensuse.org/viewcvs/yast?rev=60861&view=rev
Log:
skip X configuration if framebuffer does not exist (bnc#565877)
2.17.12

Modified:
    branches/SuSE-Code-11-SP1-Branch/x11/VERSION
    branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes
    branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp

Modified: branches/SuSE-Code-11-SP1-Branch/x11/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/x11/VERSION?rev=60861&r1=60860&r2=60861&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/x11/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/x11/VERSION Thu Feb 18 21:11:11 2010
@@ -1 +1 @@
-2.17.11
+2.17.12

Modified: branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes?rev=60861&r1=60860&r2=60861&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/x11/package/yast2-x11.changes Thu Feb 18 
21:11:11 2010
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Feb 18 21:06:04 CET 2010 - jdsn@xxxxxxx
+
+- skip X configuration if framebuffer does not exist (bnc#565877)
+- 2.17.12
+
+-------------------------------------------------------------------
 Mon Jan 26 17:22:15 CET 2009 - jdsn@xxxxxxx
 
 - no X server start via display manager without a graphics 

Modified: branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp?rev=60861&r1=60860&r2=60861&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/x11/src/proposal/x11_proposal.ycp Thu Feb 
18 21:11:11 2010
@@ -55,7 +55,9 @@
        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 )
+       // check if the framebuffer device exists AND if it has content 
(bnc#565877)
+       // newer kernels create it even if no framebuffer is available
+       if ( (integer)SCR::Execute(.target.bash, "[ -e /proc/fb ] && [ `wc -l 
/proc/fb | cut -d\" \" -f 1` -gt 0 ]") == 0 )
        {
                y2milestone("Found a framebuffer device. X11 configuration will 
be perfomed.");
        }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx