Bug#442892: patch for use without discover
Hi!
Not sure if this will be of any use, but I fixed the script to make non-discover
mode usable again. See attachment.
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)
--- /var/lib/dpkg/info/xserver-xorg.postinst 2007-11-27 05:10:31.000000000 +0100
+++ xserver-xorg.postinst 2007-12-02 08:41:28.000000000 +0100
@@ -1597,6 +1597,47 @@
fi
if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
+ DRIVER_DIRS="/usr/lib/xorg/modules/drivers"
+ for i in $DRIVER_DIRS; do
+ if [ -d $i ]; then
+ REAL_DRIVER_DIRS="$REAL_DRIVER_DIRS $i "
+ fi
+ done
+
+ if [ -n "$REAL_DRIVER_DIRS" ]; then
+ # Build list of available video drivers, omitting the atimisc, r128, and
+ # radeon sub-modules (the ati driver knows when and how to load these).
+ # v4l is not a display driver, and dummy is for advanced users.
+ DRIVER_LIST="$(find $REAL_DRIVER_DIRS -name '*_drv.*' \
+ | sed 's|^.*/\([^/]*\)_drv\.[^\._]*|\1|g' \
+ | egrep -v '^(atimisc|dummy|r128|radeon|v4l)$' | sort -u | xargs \
+ | sed 's/ /, /g' 2>/dev/null) "
+ fi
+
+ # Set a hard-coded module list (if necessary) and default driver module on an
+ # architecture-specific basis.
+ case "$ARCH" in
+ alpha)
+ DEFAULT_DRIVER=vga
+ ;;
+ amd64|hurd-i386|i386)
+ DEFAULT_DRIVER=vesa
+ ;;
+ sparc)
+ DEFAULT_DRIVER=sunffb
+ ;;
+ *)
+ DEFAULT_DRIVER=fbdev
+ ;;
+ esac
+
+ if [ -z "$DRIVER_LIST" ]; then
+ warn "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
+ DRIVER_LIST="$DEFAULT_DRIVER"
+ fi
+
+ observe "available video driver list set to \"$DRIVER_LIST\""
+
if which $DISCOVER_PROG > /dev/null 2>&1; then
PRIORITY="medium"
if [ -n "$RECONFIGURE" ]; then
@@ -1617,47 +1658,6 @@
PRIORITY=high
fi
- DRIVER_DIRS="/usr/lib/xorg/modules/drivers"
- for i in $DRIVER_DIRS; do
- if [ -d $i ]; then
- REAL_DRIVER_DIRS="$REAL_DRIVER_DIRS $i "
- fi
- done
-
- if [ -n "$REAL_DRIVER_DIRS" ]; then
- # Build list of available video drivers, omitting the atimisc, r128, and
- # radeon sub-modules (the ati driver knows when and how to load these).
- # v4l is not a display driver, and dummy is for advanced users.
- DRIVER_LIST="$(find $REAL_DRIVER_DIRS -name '*_drv.*' \
- | sed 's|^.*/\([^/]*\)_drv\.[^\._]*|\1|g' \
- | egrep -v '(atimisc|dummy|r128|radeon|v4l)' | sort -u | xargs \
- | sed 's/ /, /g' 2>/dev/null) "
- fi
-
- # Set a hard-coded module list (if necessary) and default driver module on an
- # architecture-specific basis.
- case "$ARCH" in
- alpha)
- DEFAULT_DRIVER=vga
- ;;
- amd64|hurd-i386|i386)
- DEFAULT_DRIVER=vesa
- ;;
- sparc)
- DEFAULT_DRIVER=sunffb
- ;;
- *)
- DEFAULT_DRIVER=fbdev
- ;;
- esac
-
- if [ -z "$DRIVER_LIST" ]; then
- observe "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
- DRIVER_LIST="$DEFAULT_DRIVER"
- fi
-
- observe "available video driver list set to \"$DRIVER_LIST\""
-
if [ $NDRIVERS -eq 0 ]; then
observe "could not autodetect X server driver: no video card" \
"detected, or no driver known for it"
@@ -1683,6 +1683,7 @@
observe "user declined video card autodetection (driver)"
fi
else
+ PRIORITY=high
observe "could not autodetect X server driver: $DISCOVER_PROG not found"
fi
Reply to: