/[soft]/drakx-kbd-mouse-x11/trunk/tools/display_driver_helper
ViewVC logotype

Diff of /drakx-kbd-mouse-x11/trunk/tools/display_driver_helper

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1680 by anssi, Wed Apr 27 01:32:24 2011 UTC revision 1681 by anssi, Wed Jun 15 12:40:06 2011 UTC
# Line 234  check_xorg() { Line 234  check_xorg() {
234          # no driver is selected - don't load if explicit_only is 1          # no driver is selected - don't load if explicit_only is 1
235          [ "$explicit_only" = "1" ] && return 1          [ "$explicit_only" = "1" ] && return 1
236    
237          # implicit load allowed; still don't load if no xorg.conf (i.e. live cd)          # implicit load allowed; only load if there is evidence that this is
238          [ -e "/etc/X11/xorg.conf" ]          # not a live cd or similar with automatic configuration occurring later
239            # in the boot process (which might configure a driver conflicting with
240            # the implicit driver, e.g. a proprietary one)
241            # TODO: Could this be replaced with a more robust check?
242            [ -e "/etc/X11/xorg.conf" ] || [ -e "/etc/sysconfig/harddrake2/kernels" ] ||
243                    [ -e "/etc/sysconfig/harddrake2/xorg" ] || [ -e "/boot/grub/menu.lst" ]
244  }  }
245    
246  # Load the driver for the specified modalias, if configured.  # Load the driver for the specified modalias, if configured.

Legend:
Removed from v.1680  
changed lines
  Added in v.1681

  ViewVC Help
Powered by ViewVC 1.1.28