Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings

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

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

    revision 457 by niro, Thu Jun 5 17:23:38 2008 UTC revision 458 by niro, Thu Jun 5 19:15:05 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.11 2008-06-05 17:23:38 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.12 2008-06-05 19:14:54 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 45  source /usr/lib/alxconfig-ng/functions/c Line 45  source /usr/lib/alxconfig-ng/functions/c
    45  ALX_HW_DETECT=false  ALX_HW_DETECT=false
    46  ALX_FORCED_RECHECK=false  ALX_FORCED_RECHECK=false
    47  ALX_RESET_SETTINGS=false  ALX_RESET_SETTINGS=false
     ALX_CONFD_NETWORKING=false  
    48    
    49  # unset vars which may kill us  # unset vars which may kill us
    50  unset ALX_SERIAL ALX_STATE  unset ALX_SERIAL ALX_STATE
    # Line 99  get_system_serial() Line 98  get_system_serial()
    98  {  {
    99   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE
    100    
      if [[ -f ${SETTINGSPATH}/confd-networking ]]  
      then  
      ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)"  
      else  
      ALX_IFACE="eth0"  
      fi  
       
    101   # check if serial file exists   # check if serial file exists
    102   if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]]   if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]]
    103   then   then
    # Line 642  reset_system_settings() Line 634  reset_system_settings()
    634  case $1 in  case $1 in
    635   start)   start)
    636   # check for global overrides   # check for global overrides
      [ -f ${SETTINGSPATH}/confd-networking ] && ALX_CONFD_NETWORKING=true  
    637   [ -f /hardware-auto-detection ] && ALX_FORCED_RECHECK=true   [ -f /hardware-auto-detection ] && ALX_FORCED_RECHECK=true
    638   read_cmdline hardware-auto-detection && ALX_FORCED_RECHECK=true   read_cmdline hardware-auto-detection && ALX_FORCED_RECHECK=true
    639   read_cmdline alx-reset-settings && ALX_RESET_SETTINGS=true   read_cmdline alx-reset-settings && ALX_RESET_SETTINGS=true
    Legend:
    Removed from v.457  
    changed lines
      Added in v.458