Magellan Linux

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

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

revision 419 by niro, Wed Jun 4 21:05:15 2008 UTC revision 488 by niro, Sat Jun 7 18:25:00 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.8 2008-06-04 21:05:15 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.13 2008-06-07 18:25:00 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 38  source /usr/lib/alxconfig-ng/functions/c Line 38  source /usr/lib/alxconfig-ng/functions/c
38  source /usr/lib/alxconfig-ng/functions/config_auth  source /usr/lib/alxconfig-ng/functions/config_auth
39  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source /usr/lib/alxconfig-ng/functions/config_ssh_auth
40    
 # check if mysql is available  
 [ -x /usr/bin/mysql ] && MYSQL_ALX=true  
   
41  # other needed vars  # other needed vars
42  ALX_HW_DETECT=false  ALX_HW_DETECT=false
43  ALX_FORCED_RECHECK=false  ALX_FORCED_RECHECK=false
44  ALX_RESET_SETTINGS=false  ALX_RESET_SETTINGS=false
 ALX_CONFD_NETWORKING=false  
45    
46  # unset vars which may kill us  # unset vars which may kill us
47  unset ALX_SERIAL ALX_STATE  unset ALX_SERIAL ALX_STATE
# Line 99  get_system_serial() Line 95  get_system_serial()
95  {  {
96   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE
97    
  if [[ ${ALX_CONFD_NETWORKING} = true ]]  
  then  
  ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)"  
  else  
  ALX_IFACE="eth0"  
  fi  
   
98   # check if serial file exists   # check if serial file exists
99   if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]]   if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]]
100   then   then
# Line 296  import_settings_to_db() Line 285  import_settings_to_db()
285    
286   # network   # network
287   echo -e "      Network settings ..."   echo -e "      Network settings ..."
288   if [[ ${ALX_CONFD_NETWORKING} = true ]]   # global settings
289   then   mysqldo "insert into cfg_network(serial, hostname, domain )
290   # get settings   values('${ALX_SERIAL}', '${ALX_DEFAULT_HOSTNAME}','${ALX_DEFAULT_DOMAIN}');"
  #source ${rc_base}/init.d/network &> /dev/null  
  for iface in $(onboot_interface_list ${network_settings}/net.*)  
  do  
  [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue  
  echo "WARNING: only importing settings for interface [ ${iface} ] !"  
  source ${network_settings}/net.${iface} || exit 1  
  NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"  
   
  mysqldo "insert into cfg_network(  
  hostname,  
  serial,  
  module,  
  domain,  
  networking,  
  netmask,  
  dns,  
  gateway,  
  broadcast,  
  ip,  
  forcemacto,  
  wireless_bitrate,  
  wireless_channel,  
  wireless_essid,  
  wireless_frequency,  
  wireless_mode,  
  wireless_nick,  
  wireless_auth_mode,  
  wireless_key_length,  
  wireless_key,  
  wireless_key_ascii  
  )  
  values(  
  '${ALX_DEFAULT_HOSTNAME}',  
  '${ALX_SERIAL}',  
  '${NETCARD_DRIVER}',  
  '${ALX_DEFAULT_DOMAIN}',  
  '${NETWORKING}',  
  '${NETMASK}',  
  '${NAMESERVER}',  
  '${GATEWAY}',  
  '${BROADCAST}',  
  '${IP}',  
  '${FORCE_MAC_TO}',  
  '${WIRELESS_BITRATE}',  
  '${WIRELESS_CHANNEL}',  
  '${WIRELESS_ESSID}',  
  '${WIRELESS_FREQUENCY}',  
  '${WIRELESS_MODE}',  
  '${WIRELESS_NICK}',  
  '${WIRELESS_AUTH_MODE}',  
  '${WIRELESS_KEY_LENGTH}',  
  '${WIRELESS_KEY}',  
  '${WIRELESS_KEY_ASCII}'  
  );"  
291    
292   # only insert the *FIRST* iface   # let udev decide which module should be loaded
293   break   # get all devices from sysfs
294   done   local i
295   else   local iface
296   mysqldo "insert into cfg_network(   for i in /sys/class/net/eth?
297   hostname,   do
298   serial,   iface=$(basename ${i})
299   module,   NETCARD_DRIVER=$(source /sys/class/net/${iface}/uevent; echo ${PHYSDEVDRIVER})
300   domain,   mysqldo "insert into cfg_interfaces(
301   networking   serial,
302     iface,
303     module,
304     networking
305   )   )
306   values(   values(
  '${ALX_DEFAULT_HOSTNAME}',  
307   '${ALX_SERIAL}',   '${ALX_SERIAL}',
308     '${iface}',
309   '${NETCARD_DRIVER}',   '${NETCARD_DRIVER}',
  '${ALX_DEFAULT_DOMAIN}',  
310   'dhcp'   'dhcp'
311   );"   );"
312   fi   done
313   evaluate_retval   evaluate_retval
314    
315   # xserver   # xserver
# Line 396  import_settings_to_db() Line 333  import_settings_to_db()
333    
334   # input   # input
335   echo -e "      Input settings ..."   echo -e "      Input settings ..."
336   mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"   mysqldo "insert into cfg_input(serial,mouse,keyboard) values('${ALX_SERIAL}','${XMOUSETYPE}','kbd');"
337   evaluate_retval   evaluate_retval
338    
339   # auth   # auth
# Line 461  update_settings_in_db() Line 398  update_settings_in_db()
398    
399   # network   # network
400   echo -e "      Network settings ..."   echo -e "      Network settings ..."
401   if [[ ${ALX_CONFD_NETWORKING} = true ]]   mysqldo "update cfg_network set
402   then   hostname='${ALX_DEFAULT_HOSTNAME}',
403   # get settings   domain='${ALX_DEFAULT_DOMAIN}';
404   #source ${rc_base}/init.d/network &> /dev/null   where serial=${ALX_SERIAL};"
405   for iface in $(onboot_interface_list ${network_settings}/net.*)  
406   do   # let udev decide which module should be loaded
407   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   # get all devices from sysfs
408   echo "WARNING: only importing settings for interface [ ${iface} ] !"   local i
409   source ${network_settings}/net.${iface} || exit 1   local iface
410   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   for i in /sys/class/net/eth?
411     do
412   mysqldo "update cfg_network set   iface=$(basename ${i})
413   hostname='${ALX_DEFAULT_HOSTNAME}',   NETCARD_DRIVER=$(source /sys/class/net/${iface}/uevent; echo ${PHYSDEVDRIVER})
414   module='${NETCARD_DRIVER}',   mysqldo "update cfg_interfaces set
415   domain='${ALX_DEFAULT_DOMAIN}',   iface='${iface}',
416   networking='${NETWORKING}',   module='${NETCARD_DRIVER}',
417   netmask='${NETMASK}',   networking='${NETWORKING}',
418   dns='${NAMESERVER}',   where serial=${ALX_SERIAL};"
  gateway='${GATEWAY}',  
  broadcast='${BROADCAST}',  
  ip='${IP}',  
  forcemacto='${FORCE_MAC_TO}',  
  wireless_bitrate='${WIRELESS_BITRATE}',  
  wireless_channel='${WIRELESS_CHANNEL}',  
  wireless_essid='${WIRELESS_ESSID}',  
  wireless_frequency='${WIRELESS_FREQUENCY}',  
  wireless_mode='${WIRELESS_MODE}',  
  wireless_nick='${WIRELESS_NICK}',  
  wireless_auth_mode='${WIRELESS_AUTH_MODE}',  
  wireless_key_length='${WIRELESS_KEY_LENGTH}',  
  wireless_key='${WIRELESS_KEY}',  
  wireless_key_ascii='${WIRELESS_KEY_ASCII}'  
  where serial=${ALX_SERIAL};"  
419    
420   # only insert the *FIRST* iface   # only insert the *FIRST* iface
421   break   break
422   done   done
  else  
  mysqldo "update cfg_network set  
  hostname='${ALX_DEFAULT_HOSTNAME}',  
  module='${NETCARD_DRIVER}',  
  domain='${ALX_DEFAULT_DOMAIN}',  
  networking='dhcp'  
  where serial=${ALX_SERIAL};"  
  fi  
423   evaluate_retval   evaluate_retval
424    
425   # xserver   # xserver
# Line 521  update_settings_in_db() Line 435  update_settings_in_db()
435    
436   # input   # input
437   echo -e "      Input settings ..."   echo -e "      Input settings ..."
438   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"   mysqldo "update cfg_input set mouse='${XMOUSETYPE}', keyboard='kbd' where serial=${ALX_SERIAL};"
439   evaluate_retval   evaluate_retval
440  }  }
441    
# Line 586  import_settings_local() Line 500  import_settings_local()
500   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
501   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
502    
   
503   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
504   # basic config   # basic config
505   cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc   cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
# Line 715  reset_system_settings() Line 628  reset_system_settings()
628   reboot   reboot
629  }  }
630    
 onboot_interface_list()  
 {  
  local file  
  local devices  
  local iface  
   
  # get list of all devices  
  for file in $@  
  do  
  if [[ $(read_value ONBOOT ${file}) = yes ]]  
  then  
  iface="$(basename ${file} | sed s/net.//)"  
  # exclude backup files  
  case "${iface}" in  
  *~) ;;  
  *) devices="${devices} $(basename ${file} | sed s/net.//)" ;;  
  esac  
  fi  
  done  
   
  echo "${devices}"  
 }  
   
 # 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}"  
 }  
   
631  case $1 in  case $1 in
632   start)   start)
633   # check for global overrides   # check for global overrides
  [ -f ${SETTINGSPATH}/confd-networking ] && ALX_CONFD_NETWORKING=true  
634   [ -f /hardware-auto-detection ] && ALX_FORCED_RECHECK=true   [ -f /hardware-auto-detection ] && ALX_FORCED_RECHECK=true
635   read_cmdline hardware-auto-detection && ALX_FORCED_RECHECK=true   read_cmdline hardware-auto-detection && ALX_FORCED_RECHECK=true
636   read_cmdline alx-reset-settings && ALX_RESET_SETTINGS=true   read_cmdline alx-reset-settings && ALX_RESET_SETTINGS=true

Legend:
Removed from v.419  
changed lines
  Added in v.488