[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#448845: dexconf should allow empty xserver-xorg/config/device/driver



tags 448845 patch
thanks

Hi,

This patch should fix the problem, and allow the cull of postinst/dexconf to
continue.

Thanks, Kel.
---
diff -Nrup xorg-7.3+3/debian/local/dexconf xorg-7.3+3.dexconf-no-driver/debian/local/dexconf
--- xorg-7.3+3/debian/local/dexconf	2007-11-01 12:39:14.000000000 +1000
+++ xorg-7.3+3.dexconf-no-driver/debian/local/dexconf	2007-11-01 22:07:11.000000000 +1000
@@ -233,9 +233,9 @@ printf "EndSection\n" >&4
 
 fetch xserver-$SERVER/config/device/identifier
 DEVICE_IDENTIFIER="$RET"
-fetch xserver-$SERVER/config/device/driver
+# Driver, BusID, VideoRam, and UseFBDev are permitted to be null.
+db_get xserver-$SERVER/config/device/driver
 DEVICE_DRIVER="$RET"
-# BusID, VideoRam, and UseFBDev are permitted to be null.
 db_get xserver-$SERVER/config/device/bus_id
 DEVICE_BUSID="$RET"
 db_get xserver-$SERVER/config/device/use_fbdev
@@ -244,8 +244,10 @@ exec 4>"$DEXCONFTMPDIR/Device"
 cat >&4 <<SECTION
 Section "Device"
 	Identifier	"$DEVICE_IDENTIFIER"
-	Driver		"$DEVICE_DRIVER"
 SECTION
+if [ -n "$DEVICE_DRIVER" ]; then
+  printf "\tDriver\t\t\"$DEVICE_DRIVER\"\n" >&4
+fi
 if [ -n "$DEVICE_BUSID" ]; then
   printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >&4
 fi




Reply to: