Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.client.class.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.client.class.in

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

    revision 2193 by niro, Fri Jan 10 14:40:31 2014 UTC revision 2194 by niro, Fri Jan 10 14:41:09 2014 UTC
    # Line 25  helper_graphic_rebuild_xorg_conf_d() Line 25  helper_graphic_rebuild_xorg_conf_d()
    25    
    26   # rebuild 25-gfxcard.conf   # rebuild 25-gfxcard.conf
    27   # always clear the config   # always clear the config
    28   CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-device.conf"   CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-device.conf"
    29   clearconfig   clearconfig
    30   addconfig "# Autogenerated by mcored"   addconfig "# Autogenerated by mcored"
    31   # but only add lines if some values are found in config.d dir   # but only add lines if some values are found in config.d dir
    # Line 38  helper_graphic_rebuild_xorg_conf_d() Line 38  helper_graphic_rebuild_xorg_conf_d()
    38    
    39   # rebuild 25-module.conf   # rebuild 25-module.conf
    40   # always clear the config   # always clear the config
    41   CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-module.conf"   CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-module.conf"
    42   clearconfig   clearconfig
    43   addconfig "# Autogenerated by mcored"   addconfig "# Autogenerated by mcored"
    44   # but only add lines if some values are found in config.d dir   # but only add lines if some values are found in config.d dir
    # Line 51  helper_graphic_rebuild_xorg_conf_d() Line 51  helper_graphic_rebuild_xorg_conf_d()
    51    
    52   # rebuild 25-screen.conf   # rebuild 25-screen.conf
    53   # always clear the config   # always clear the config
    54   CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-screen.conf"   CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-screen.conf"
    55   clearconfig   clearconfig
    56   addconfig "# Autogenerated by mcored"   addconfig "# Autogenerated by mcored"
    57   # but only add lines if some values are found in config.d dir   # but only add lines if some values are found in config.d dir
    # Line 166  set_graphic_refresh() Line 166  set_graphic_refresh()
    166  set_graphic_driver()  set_graphic_driver()
    167  {  {
    168   local driver="$1"   local driver="$1"
    169   local driverdir="/usr/lib/xorg/modules/drivers"   local driverdir="@@LIBDIR@@/xorg/modules/drivers"
    170   local CONFIG   local CONFIG
    171   [[ -z ${driver} ]] && help_graphic_driver && return 1   [[ -z ${driver} ]] && help_graphic_driver && return 1
    172    
    # Line 190  set_graphic_driver() Line 190  set_graphic_driver()
    190  get_graphic_driver()  get_graphic_driver()
    191  {  {
    192   local action="$1"   local action="$1"
    193   local driverdir="/usr/lib/xorg/modules/drivers"   local driverdir="@@LIBDIR@@/xorg/modules/drivers"
    194   local driver   local driver
    195   local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"   local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
    196   local i   local i
    Legend:
    Removed from v.2193  
    changed lines
      Added in v.2194