Magellan Linux

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

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

revision 3438 by niro, Wed Apr 11 11:42:24 2012 UTC revision 4836 by niro, Mon May 13 11:14:20 2013 UTC
# Line 8  config_display_manager() Line 8  config_display_manager()
8   sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf   sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf
9    
10   # windowmanager   # windowmanager
11   echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc   local CONFIG="${ALX_UNPRIV_HOME}/.xinitrc"
12     clearconfig
13     addconfig "exec startfluxbox"
14  }  }
15    
16  config_x11()  config_x11()
# Line 32  config_x11() Line 34  config_x11()
34   fi   fi
35    
36   # show which server we use   # show which server we use
37   echo -en ${COLOREDSTAR}"Configuring Xorg x11-server "   rc_echo -en ${COLOREDSTAR}"Configuring Xorg x11-server "
38    
39   # show if we have vnc   # show if we have vnc
40   if [[ ${has_tigervnc} = yes ]]   if [[ ${has_tigervnc} = yes ]]
41   then   then
42   echo "with tigervnc enabled ..."   rc_echo "with tigervnc enabled ..."
43   else   else
44   echo "..."   rc_echo "..."
45   fi   fi
46    
47   # set_input_keyboard   # set_input_keyboard
# Line 84  config_x11() Line 86  config_x11()
86   # fallback   # fallback
87   [[ ${hsync} = 0-0 ]] && hsync="28-96"   [[ ${hsync} = 0-0 ]] && hsync="28-96"
88   [[ ${vsync} = 0-0 ]] && vsync="50-60"   [[ ${vsync} = 0-0 ]] && vsync="50-60"
89    
90   addconfig   addconfig
91   addconfig " HorizSync ${hsync}"   addconfig " HorizSync ${hsync}"
92   addconfig " VertRefresh ${vsync}"   addconfig " VertRefresh ${vsync}"

Legend:
Removed from v.3438  
changed lines
  Added in v.4836