Magellan Linux

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

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

revision 313 by niro, Wed Aug 31 21:31:09 2005 UTC revision 319 by niro, Thu Sep 1 18:30:28 2005 UTC
# Line 11  Line 11 
11  #%before:  #%before:
12  #%after:  #%after:
13    
14  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.19 2005-08-31 21:31:09 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.21 2005-09-01 18:30:28 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 220  get_system_serial(){ Line 220  get_system_serial(){
220   # request a new serial; one command now (cause must be done in the same session)   # request a new serial; one command now (cause must be done in the same session)
221   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
222   "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');   "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');
223   select last_insert_id() + 1;")   select last_insert_id();")
224    
225   if [ "${ALX_SERIAL}" != NULL ]   if [ "${ALX_SERIAL}" != NULL ]
226   then   then
# Line 462  import_settings_local(){ Line 462  import_settings_local(){
462   cat ${ALX_SKELETONS}/fluxbox/init \   cat ${ALX_SKELETONS}/fluxbox/init \
463   > ${ALX_UNPRIV_HOME}/.fluxbox/init   > ${ALX_UNPRIV_HOME}/.fluxbox/init
464    
465     # fluxbox autostart
466     cat ${ALX_SKELETONS}/fluxbox/apps \
467     > ${ALX_UNPRIV_HOME}/.fluxbox/apps
468    
469   # fluxbox menu header   # fluxbox menu header
470   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header \
471   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   > ${ALX_UNPRIV_HOME}/.fluxbox/menu

Legend:
Removed from v.313  
changed lines
  Added in v.319