Magellan Linux

Diff of /alx-src/trunk/tinyalxconfig-ng/functions/config_x11.sh

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

revision 477 by niro, Sat Jun 7 09:43:17 2008 UTC revision 511 by niro, Tue Jun 17 19:09:58 2008 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_x11.sh,v 1.6 2008-06-07 09:43:17 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_x11.sh,v 1.7 2008-06-17 19:09:58 niro Exp $
2  # configures the x11 server on the host via mysql db settings  # configures the x11 server on the host via mysql db settings
3    
4  get_x11_settings()  get_x11_settings()
# Line 80  config_x11() Line 80  config_x11()
80    
81   local xserver   local xserver
82   local xfconfig   local xfconfig
83     local startx
84   local HAS_REALVNC=no   local HAS_REALVNC=no
85    
86   # xfree or xorg ?   # xfree or xorg ?
87   xserver="Xorg"   xserver="Xorg"
88   # todo: maybe kdrive support?   # todo: maybe kdrive support?
89   case ${xserver} in   case ${xserver} in
90   Xorg) xfconfig=/etc/X11/xorg.conf ;;   Xorg) xfconfig=/etc/X11/xorg.conf; startx=startx-xorg ;;
91   esac   esac
92    
93   [ -f /usr/lib/modules/extensions/vnc.so ] && HAS_REALVNC="yes"   [ -f /usr/lib/modules/extensions/vnc.so ] && HAS_REALVNC="yes"
# Line 244  config_x11() Line 245  config_x11()
245   install -d ${SETTINGSPATH}   install -d ${SETTINGSPATH}
246   echo "ALX_MOUSE_ACCELERATION=\"${ALX_MOUSE_ACCELERATION}\"" > ${SETTINGSPATH}/mouse   echo "ALX_MOUSE_ACCELERATION=\"${ALX_MOUSE_ACCELERATION}\"" > ${SETTINGSPATH}/mouse
247   echo "ALX_MOUSE_THRESHOLD=\"${ALX_MOUSE_THRESHOLD}\"" >> ${SETTINGSPATH}/mouse   echo "ALX_MOUSE_THRESHOLD=\"${ALX_MOUSE_THRESHOLD}\"" >> ${SETTINGSPATH}/mouse
248    
249     # setup startx
250     ln -snf ${xserver} /usr/bin/X
251     ln -snf ${startx} /usr/bin/startx
252  }  }

Legend:
Removed from v.477  
changed lines
  Added in v.511