Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/functions/config_x11.sh

    Diff of /alx-src/branches/alxconf-060/functions/config_x11.sh

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

    revision 2386 by niro, Tue Jun 14 17:20:39 2011 UTC revision 3277 by niro, Wed Nov 2 13:53:14 2011 UTC
    # Line 24  config_x11() Line 24  config_x11()
    24   config_display_manager   config_display_manager
    25    
    26   # got we vnc support ?   # got we vnc support ?
    27   if [ -f /usr/X11R6/lib/xorg/modules/extensions/libvnc.so ]   if [ -f /usr/lib/xorg/modules/extensions/libvnc.so ]
    28   then   then
    29   has_tigervnc="yes"   has_tigervnc="yes"
    30   else   else
    # Line 92  config_x11() Line 92  config_x11()
    92    
    93   # add cvt modelines   # add cvt modelines
    94   addconfig   addconfig
    95   local cvt="/usr/X11R6/bin/cvt"   local cvt="/usr/bin/cvt"
    96   local modeline   local modeline
    97   modeline=$("${cvt}" "${cfg_graphic_resolution%x*}" "${cfg_graphic_resolution#*x}" "${cfg_graphic_refresh_rate}" | sed -e 's:^:\t:g' -e 's:_.*\":\":')   modeline=$("${cvt}" "${cfg_graphic_resolution%x*}" "${cfg_graphic_resolution#*x}" "${cfg_graphic_refresh_rate}" | sed -e 's:^:\t:g' -e 's:_.*\":\":')
    98   addconfig "${modeline}"   addconfig "${modeline}"
    # Line 126  config_x11() Line 126  config_x11()
    126   addconfig 'EndSection'   addconfig 'EndSection'
    127    
    128   # fixes   # fixes
    129   # disable LVDS-1 on zotacs   # disable LVDS-1 on zotacs or enable it if hdmi was requested
    130   if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]   if [[ $(alx-hwdetection system) = zotac ]]
    131   then   then
    132   CONFIG="/etc/X11/xorg.conf.d/30-fix-zotac.conf"   CONFIG="/etc/X11/xorg.conf.d/30-fix-zotac.conf"
    133   clearconfig   clearconfig
    134   addconfig 'Section "Monitor"'   addconfig 'Section "Monitor"'
    135   addconfig ' Identifier "LVDS1"'   addconfig ' Identifier "LVDS1"'
    136   addconfig ' Option "Ignore" "True"'   if [[ ${cfg_graphic_hdmi} = enable ]]
    137     then
    138     # add cvt modelines
    139     addconfig
    140     local cvt="/usr/bin/cvt"
    141     local modeline
    142     modeline=$("${cvt}" "${cfg_graphic_resolution%x*}" "${cfg_graphic_resolution#*x}" "${cfg_graphic_refresh_rate}" | sed -e 's:^:\t:g' -e 's:_.*\":\":')
    143     addconfig "${modeline}"
    144     else
    145     addconfig ' Option "Ignore" "True"'
    146     fi
    147   addconfig 'EndSection'   addconfig 'EndSection'
    148   else   else
    149   # clear this file   # clear this file
    Legend:
    Removed from v.2386  
    changed lines
      Added in v.3277