فهرست منبع

More robust Xorg autoconfiguration

Tolerate Xorg -configure reporting a problem with multiple cards per
device by instead heuristically checking that the generated xorg.conf
is correct via trailing empty line detection.
Maxim Kammerer 12 سال پیش
والد
کامیت
fe13c25558
2فایلهای تغییر یافته به همراه3 افزوده شده و 1 حذف شده
  1. 1 0
      doc/changelog.txt
  2. 2 1
      src/etc/init.d/xconfig

+ 1 - 0
doc/changelog.txt

@@ -5,6 +5,7 @@
   * Xorg server 1.13
 
   * Added "gentoo=xkms" boot parameter for forcing X modesetting driver
+  * More robust Xorg autoconfiguration
 
   * Added UFRaw, a RAW images viewer and converter
   * Added proxychains, a heterogeneous chaining proxyfier

+ 2 - 1
src/etc/init.d/xconfig

@@ -85,7 +85,8 @@ start() {
         fi
         umount ${xorgdrv}
 
-        if [ -e ${xorgdir}/xorg.conf.new ]  &&  ! grep -q 'Configuration failed' ${xorglog}; then
+        # Empty last line means no section writing was stopped in the middle
+        if [ -e ${xorgdir}/xorg.conf.new ]  &&  [ "`tail -1 ${xorgdir}/xorg.conf.new`" = "" ]; then
             mv ${xorgdir}/xorg.conf.new ${xorgdir}/xorg.conf
 
             # Turn off text cursor on vt3 (cf. xserverrc)