Magellan Linux

Diff of /alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings

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

revision 505 by niro, Tue Jun 10 23:13:06 2008 UTC revision 518 by niro, Sun Jun 22 22:26:47 2008 UTC
# Line 11  Line 11 
11  #%before:  #%before:
12  #%after:  #%after:
13    
14  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.20 2008-06-10 23:13:06 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.23 2008-06-22 22:26:47 niro Exp $
15    
16  # checks first if the client was already configured and if it has an valid serial  # checks first if the client was already configured and if it has an valid serial
17  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
# Line 529  import_settings_local() Line 529  import_settings_local()
529   # (no txt - length required, xtdesk manage that itself)   # (no txt - length required, xtdesk manage that itself)
530   xres="$((1024 / 2))"   xres="$((1024 / 2))"
531   # default y pos (full yres -22 !)   # default y pos (full yres -22 !)
532   yres="$((768 - 22 ))"   #yres="$((768 - 22 ))"
533     # place it at top
534     yres="-5"
535    
536   generate_icon \   generate_icon \
537   --name "${sysinfo}" \   --name "${sysinfo}" \
# Line 541  import_settings_local() Line 543  import_settings_local()
543   --icon-width "1" \   --icon-width "1" \
544   --icon-height "1"   --icon-height "1"
545    
546   # create a xinitrc   # check for Xorg or kdrive (use Xvesa)
547   echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc   if [[ -x /usr/bin/Xorg ]]
548     then
549     ln -snf Xorg /usr/bin/X
550     ln -snf startx-xorg /usr/bin/startx
551    
552     elif [[ -x /usr/bin/Xvesa ]]
553     then
554     ln -snf Xvesa /usr/bin/X
555     ln -snf startx-kdrive /usr/bin/startx
556     fi
557    
558   # set correct permissions   # set correct permissions
559   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}

Legend:
Removed from v.505  
changed lines
  Added in v.518