Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 49043
Collapse All | Expand All

(-)Xeasyconf.orig (-11 / +11 lines)
Lines 29-42 Link Here
29
fi
29
fi
30
30
31
# Another show stopper:
31
# Another show stopper:
32
if [ ! -r /usr/X11R6/bin/XFree86 ]; then
32
if [ ! -r /usr/X11R6/bin/X ]; then
33
dialog --title "ERROR" \
33
dialog --title "ERROR" \
34
  --msgbox "/usr/X11R6/bin/XFree86 doesn't exist.  Exiting." 8 40
34
  --msgbox "/usr/X11R6/bin/X doesn't exist.  Exiting." 8 40
35
  exit 1
35
  exit 1
36
fi
36
fi
37
37
38
dialog --title "CONFIGURE X SERVER?" --yesno \
38
dialog --title "CONFIGURE X SERVER?" --yesno \
39
"We will start by letting Xfree probe and try to autodetect your settings. \
39
"We will start by letting X probe and try to autodetect your settings. \
40
Are you ready to begin? (Your screen will blank momentarily)" 7 63
40
Are you ready to begin? (Your screen will blank momentarily)" 7 63
41
41
42
if [ ! $? = 0 ]; then
42
if [ ! $? = 0 ]; then
Lines 47-57 Link Here
47
47
48
rm -f $HOME/XF86Config.new
48
rm -f $HOME/XF86Config.new
49
49
50
/usr/X11R6/bin/XFree86 -configure :1
50
/usr/X11R6/bin/X -configure :1
51
if [ ! $? = 0 ]; then
51
if [ ! $? = 0 ]; then
52
  # failure, bail.
52
  # failure, bail.
53
dialog --title "XFree86 MISSING" \
53
dialog --title "X MISSING" \
54
  --msgbox "/usr/X11R6/bin/XFree86 doesn't exist.  Exiting."
54
  --msgbox "/usr/X11R6/bin/X doesn't exist.  Exiting."
55
  exit 1
55
  exit 1
56
fi
56
fi
57
57
Lines 63-69 Link Here
63
63
64
dialog --title "SELECT VIDEO CARD DRIVER" \
64
dialog --title "SELECT VIDEO CARD DRIVER" \
65
  --menu "Select your video driver" 15 80 9 \
65
  --menu "Select your video driver" 15 80 9 \
66
  "auto" "Let XFree86 pick (suggested)" \
66
  "auto" "Let X pick (suggested)" \
67
  "ati" "Mach 64, Rage, Radeon (doesn't work on all configs)" \
67
  "ati" "Mach 64, Rage, Radeon (doesn't work on all configs)" \
68
  "nv" "Nvidia (Geforce) (experimental - see README)" \
68
  "nv" "Nvidia (Geforce) (experimental - see README)" \
69
  "mga" "Matrox" \
69
  "mga" "Matrox" \
Lines 233-239 Link Here
233
    HANDLER=skip
233
    HANDLER=skip
234
  fi
234
  fi
235
235
236
  # keep the XFree86 default of vga from slipping through
236
  # keep the X default of vga from slipping through
237
  # as it doesn't work on ppc, instead use fbdev
237
  # as it doesn't work on ppc, instead use fbdev
238
238
239
  if echo $LINE | grep "Driver" | grep "vga" 1> /dev/null ; then
239
  if echo $LINE | grep "Driver" | grep "vga" 1> /dev/null ; then
Lines 293-299 Link Here
293
    HANDLER=none
293
    HANDLER=none
294
  fi
294
  fi
295
295
296
# Xfree pre xkb maps are currently broken, let xfree pick your defaults
296
# X pre xkb maps are currently broken, let x pick your defaults
297
# and it seems to work much better
297
# and it seems to work much better
298
298
299
#  # add typical ppc keyboard options
299
#  # add typical ppc keyboard options
Lines 349-354 Link Here
349
rm -f $TMP/modes
349
rm -f $TMP/modes
350
rm -f $TMP/keymap
350
rm -f $TMP/keymap
351
351
352
dialog --title "XFree86 CONFIGURED" \
352
dialog --title "X CONFIGURED" \
353
  --msgbox "Your new XFree86 configuration file \nhas been saved to $XF86CONFIG. \n\n\
353
  --msgbox "Your new X configuration file \nhas been saved to $XF86CONFIG. \n\n\
354
You can test with X -xf86config $XF86CONFIG \nor for the brave simply try startx :^)"  15 60
354
You can test with X -xf86config $XF86CONFIG \nor for the brave simply try startx :^)"  15 60

Return to bug 49043