Magellan Linux

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

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

revision 295 by niro, Thu Aug 18 07:39:00 2005 UTC revision 307 by niro, Sun Aug 28 19:30:53 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.16 2005-08-18 07:39:00 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.18 2005-08-28 19:30:53 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 114  get_system_serial(){ Line 114  get_system_serial(){
114   then   then
115   ALX_STATE="ok"   ALX_STATE="ok"
116   else   else
117     # abort on non valid serial
118   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
119     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
120     show_invalid_serial_msg
121     exit 1
122   fi   fi
123    
124   else   else
# Line 170  get_system_serial(){ Line 174  get_system_serial(){
174   then   then
175   ALX_STATE="ok"   ALX_STATE="ok"
176   else   else
177     # abort on non valid serial
178   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
179     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
180     show_invalid_serial_msg
181     exit 1
182   fi   fi
183    
184   # write current state to temp file   # write current state to temp file
# Line 450  import_settings_local(){ Line 458  import_settings_local(){
458   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header \
459   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   > ${ALX_UNPRIV_HOME}/.fluxbox/menu
460    
461     # now fix it with proper messages :P
462     local ver="$(< /etc/mageversion)"
463     sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \
464     ${ALX_UNPRIV_HOME}/.fluxbox/menu
465    
466   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
467   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
468    

Legend:
Removed from v.295  
changed lines
  Added in v.307