On Mon, Apr 17, 2006 at 01:40:36AM -0500, X Strike Force SVN Repository Admin wrote:
> Author: dnusinow
> Date: 2006-04-17 02:40:35 -0400 (Mon, 17 Apr 2006)
> New Revision: 1829
>
> Modified:
> trunk/debian/xorg/debian/changelog
> trunk/debian/xorg/debian/xserver-xorg.config.in
> Log:
> * Grab discover_video function from xserver-xorg.config.in from 6.9. The
> discover2 support was dropped solely in favor of discover1. This caused
> people with discover installed instead of discover1 to have an error
> returning 64 on their xserver-xorg postinstall. Thanks to Daniele
> Venzano for the bug report. Thanks to Steve Gran and Steve Langasek for
> tracking this down. (closes: #362891)
>
> Modified: trunk/debian/xorg/debian/changelog
> ===================================================================
> --- trunk/debian/xorg/debian/changelog 2006-04-17 06:00:14 UTC (rev 1828)
> +++ trunk/debian/xorg/debian/changelog 2006-04-17 06:40:35 UTC (rev 1829)
> @@ -2,8 +2,14 @@
>
> * Add more versioned conflicts (libmotif-dev, motif-clients, xslideshow,
> xtrkcad). Thanks Steve Langasek.
> + * Grab discover_video function from xserver-xorg.config.in from 6.9. The
> + discover2 support was dropped solely in favor of discover1. This caused
> + people with discover installed instead of discover1 to have an error
> + returning 64 on their xserver-xorg postinstall. Thanks to Daniele
> + Venzano for the bug report. Thanks to Steve Gran and Steve Langasek for
> + tracking this down. (closes: #362891)
>
> - -- David Nusinow <dnusinow@debian.org> Mon, 17 Apr 2006 00:13:35 -0400
> + -- David Nusinow <dnusinow@debian.org> Mon, 17 Apr 2006 02:10:50 -0400
>
> xorg (1:7.0.13) unstable; urgency=low
>
>
> Modified: trunk/debian/xorg/debian/xserver-xorg.config.in
> ===================================================================
> --- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-04-17 06:00:14 UTC (rev 1828)
> +++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-04-17 06:40:35 UTC (rev 1829)
> @@ -59,14 +59,43 @@
> }
>
> discover_video () {
> - if which discover >/dev/null 2>&1; then
> - # must be Discover 1.x
> - DISCOVERED_VIDEO=$(discover --disable-all --enable=pci \
> - --format="%V %M\t%S\t%D\n" video 2>/dev/null)
[...]
> + # must be Discover 1.x
> + DISCOVERED_VIDEO=$(discover --disable=serial,parallel,usb,ide,scsi \
> + --format="%V %M\t%S\t%D\n" video 2>/dev/null)
> + fi
This is somewhat of a regression: --disable-all --enable=pci,sbus should
be passed, since IIRC those are the only two buses we support scanning.
Otherwise, you try to scan stuff like the USB bus, and the whole things
just hangs or crashes.
Attachment:
signature.asc
Description: Digital signature