Author: dnusinow Date: 2005-10-04 19:39:14 -0500 (Tue, 04 Oct 2005) New Revision: 655
Modified: trunk/debian/changelog trunk/debian/xserver-xorg.config.in Log: * Ensure that all templates containing the name "autodetect" are reset in the auto_answer function Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2005-10-04 23:36:42 UTC (rev 654) +++ trunk/debian/changelog 2005-10-05 00:39:14 UTC (rev 655) @@ -47,6 +47,8 @@ + Reset values for templates that are affected by autodetection only when the user actually opts for autodetection. This allows autodetection to actually work. Thanks Daniel Stone. + + Ensure that all templates containing the name "autodetect" are reset in + the auto_answer function * Provide extra insurance for autodetecting drivers on installation. Also update driver default lists for amd64 and i386. (closes: #320634) * Have packages built specifically for etch be counted as official builds. @@ -67,7 +69,7 @@ * debian/control: Changed xutils' dependency on ssh to ssh-server and ssh-client. ssh is not longer a package, now that openssh splitted in two. - -- David Nusinow <[EMAIL PROTECTED]> Tue, 4 Oct 2005 19:33:08 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Tue, 4 Oct 2005 20:37:37 -0400 xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high Modified: trunk/debian/xserver-xorg.config.in =================================================================== --- trunk/debian/xserver-xorg.config.in 2005-10-04 23:36:42 UTC (rev 654) +++ trunk/debian/xserver-xorg.config.in 2005-10-05 00:39:14 UTC (rev 655) @@ -332,6 +332,10 @@ DEFAULT_ANSWER=$4 set +e debug_echo "auto_answer() \"$INPUT_COMMAND $PRIORITY $TEMPLATE\" with default \"$DEFAULT_ANSWER\"" + if echo $TEMPLATE | grep "autodetect" > /dev/null; then + db_reset $TEMPLATE + echo "auto_answer() resetting template $TEMPLATE" + fi db_fget "$TEMPLATE" seen # are we re-configuring? if [ -z "$FIRSTINST" ] && [ "$RET" = "true" ]; then -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]