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

Bug#242216: xserver-xfree86.config hardcodes different defaults for display selection method on different priorities



tag 242216 + patch
thanks

> > Could you please explain what you mean?
>
> Sure.
> ...
> I am referring to the large case statement at line 990 of
> xserver-xfree86.config.in[1].
>
> The Simple) and Medium) cases have no auto-answer logic.  Your patch
> should not be applied until they do.

I'm not sure I understand why auto_answer logic is needed there, but anyway 
the attached patch is probably what you wish.

Index: xserver-xfree86.config.in
===================================================================
--- xserver-xfree86.config.in	(revision 1225)
+++ xserver-xfree86.config.in	(working copy)
@@ -978,19 +978,19 @@
 MONITOR_IS_LCD="$RET"
 if [ "$RET" = "true" ]; then
   db_subst xserver-xfree86/config/monitor/selection-method choices "Medium, Advanced"
-  db_subst xserver-xfree86/config/monitor/selection-method default "Medium"
+  DEFAULT="Medium"
 else # not an LCD
   db_subst xserver-xfree86/config/monitor/selection-method choices "Simple, Medium, Advanced"
-  db_subst xserver-xfree86/config/monitor/selection-method default "Simple"
+  DEFAULT="Simple"
 fi
 
-auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/selection-method "Advanced"
+db_subst xserver-xfree86/config/monitor/selection-method default $DEFAULT
+auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/selection-method $DEFAULT
 
 db_get xserver-xfree86/config/monitor/selection-method
 case "$RET" in
   Simple)
-    db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/screen-size || debug_report_status "db_input $(priority_ceil $PRIORITY) xserver-xfree86/config/monitor/screen-size" "$?"
-    db_go
+    auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/screen-size "15 inches (380 mm)"
     db_get xserver-xfree86/config/monitor/screen-size
     case "$RET" in
       'Up to 14 inches (355 mm)')
@@ -1016,8 +1016,7 @@
     esac
     ;;
   Medium)
-    db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/mode-list || debug_report_status "db_input $(priority_ceil $PRIORITY) xserver-xfree86/config/monitor/mode-list" "$?"
-    db_go
+    auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/mode-list "1024x768 @ 75Hz"
     db_get xserver-xfree86/config/monitor/mode-list
     case "$RET" in
       "640x480 @ 60Hz")

Reply to: