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 443 by niro, Wed Jun 4 21:05:15 2008 UTC revision 444 by niro, Thu Jun 5 17:17:49 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.9 2008-06-05 17:17:49 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 99  get_system_serial() Line 99  get_system_serial()
    99  {  {
    100   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE
    101    
    102   if [[ ${ALX_CONFD_NETWORKING} = true ]]   if [[ -f ${SETTINGSPATH}/confd-networking ]]
    103   then   then
    104   ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)"   ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)"
    105   else   else
    # Line 296  import_settings_to_db() Line 296  import_settings_to_db()
    296    
    297   # network   # network
    298   echo -e "      Network settings ..."   echo -e "      Network settings ..."
    299   if [[ ${ALX_CONFD_NETWORKING} = true ]]   # global settings
    300   then   mysqldo "insert into cfg_network(serial, hostname, domain )
    301   # 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}'  
      );"  
    302    
    303   # only insert the *FIRST* iface   # let udev decide which module should be loaded
    304   break   # get all devices from sysfs
    305   done   local i
    306   else   local iface
    307   mysqldo "insert into cfg_network(   for i in /sys/class/net/eth?
    308   hostname,   do
    309   serial,   iface=$(basename ${i})
    310   module,   NETCARD_DRIVER=$(source /sys/class/net/${iface}/uevent; echo ${PHYSDEVDRIVER})
    311   domain,   mysqldo "insert into cfg_interfaces(
    312   networking   serial,
    313     iface,
    314     module,
    315     networking
    316   )   )
    317   values(   values(
      '${ALX_DEFAULT_HOSTNAME}',  
    318   '${ALX_SERIAL}',   '${ALX_SERIAL}',
    319     '${iface}',
    320   '${NETCARD_DRIVER}',   '${NETCARD_DRIVER}',
      '${ALX_DEFAULT_DOMAIN}',  
    321   'dhcp'   'dhcp'
    322   );"   );"
    323   fi   done
    324   evaluate_retval   evaluate_retval
    325    
    326   # xserver   # xserver
    # Line 396  import_settings_to_db() Line 344  import_settings_to_db()
    344    
    345   # input   # input
    346   echo -e "      Input settings ..."   echo -e "      Input settings ..."
    347   mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"   mysqldo "insert into cfg_input(serial,mouse,keyboard) values('${ALX_SERIAL}','${XMOUSETYPE}','kbd');"
    348   evaluate_retval   evaluate_retval
    349    
    350   # auth   # auth
    # Line 461  update_settings_in_db() Line 409  update_settings_in_db()
    409    
    410   # network   # network
    411   echo -e "      Network settings ..."   echo -e "      Network settings ..."
    412   if [[ ${ALX_CONFD_NETWORKING} = true ]]   mysqldo "update cfg_network set
    413   then   hostname='${ALX_DEFAULT_HOSTNAME}',
    414   # get settings   domain='${ALX_DEFAULT_DOMAIN}';
    415   #source ${rc_base}/init.d/network &> /dev/null   where serial=${ALX_SERIAL};"
    416   for iface in $(onboot_interface_list ${network_settings}/net.*)  
    417   do   # let udev decide which module should be loaded
    418   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   # get all devices from sysfs
    419   echo "WARNING: only importing settings for interface [ ${iface} ] !"   local i
    420   source ${network_settings}/net.${iface} || exit 1   local iface
    421   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   for i in /sys/class/net/eth?
    422     do
    423   mysqldo "update cfg_network set   iface=$(basename ${i})
    424   hostname='${ALX_DEFAULT_HOSTNAME}',   NETCARD_DRIVER=$(source /sys/class/net/${iface}/uevent; echo ${PHYSDEVDRIVER})
    425   module='${NETCARD_DRIVER}',   mysqldo "update cfg_interfaces set
    426   domain='${ALX_DEFAULT_DOMAIN}',   iface='${iface}',
    427   networking='${NETWORKING}',   module='${NETCARD_DRIVER}',
    428   netmask='${NETMASK}',   networking='${NETWORKING}',
    429   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};"  
    430    
    431   # only insert the *FIRST* iface   # only insert the *FIRST* iface
    432   break   break
    433   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  
    434   evaluate_retval   evaluate_retval
    435    
    436   # xserver   # xserver
    # Line 521  update_settings_in_db() Line 446  update_settings_in_db()
    446    
    447   # input   # input
    448   echo -e "      Input settings ..."   echo -e "      Input settings ..."
    449   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"   mysqldo "update cfg_input set mouse='${XMOUSETYPE}', keyboard='kbd' where serial=${ALX_SERIAL};"
    450   evaluate_retval   evaluate_retval
    451  }  }
    452    
    # Line 586  import_settings_local() Line 511  import_settings_local()
    511   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    512   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    513    
       
    514   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
    515   # basic config   # basic config
    516   cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc   cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
    Legend:
    Removed from v.443  
    changed lines
      Added in v.444