Magellan Linux

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

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

revision 448 by niro, Thu Jun 5 17:23:07 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.10 2008-06-05 17:23:07 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 639  reset_system_settings() Line 631  reset_system_settings()
631   reboot   reboot
632  }  }
633    
 # read values from net.* files  
 read_value()  
 {  
  local var="$1"  
  local file="$2"  
  local value  
   
  # local all possible vars  
  # global  
  local ONBOOT  
  local NETWORKING  
   
  # static  
  local IP  
  local NETMASK  
  local BROADCAST  
  local NETWORKING  
  local FORCE_MAC_TO  
   
  # dhcp  
  local DHCP_PROG  
  local DHCP_START  
  local DHCP_STOP  
   
  # default gw  
  local GATEWAY  
  local GATEWAY_IF  
   
  # wireless extensions  
  local WIRELESS_AP  
  local WIRELESS_AUTH_MODE  
  local WIRELESS_BITRATE  
  local WIRELESS_CHANNEL  
  local WIRELESS_DEFAULT_KEY  
  local WIRELESS_ESSID  
  local WIRELESS_FREQUENCY  
  local WIRELESS_KEY  
  local WIRELESS_KEY_ASCII  
  local WIRELESS_KEY_0  
  local WIRELESS_KEY_1  
  local WIRELESS_KEY_2  
  local WIRELESS_KEY_3  
  local WIRELESS_KEY_LENGTH  
  local WIRELESS_MODE  
  local WIRELESS_NICK  
  local WIRELESS_NWID  
  local WIRELESS_POWER  
   
  source ${file}  
  eval value=\$$(echo ${var})  
  echo "${value}"  
 }  
   
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.448  
changed lines
  Added in v.458