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 387 by niro, Wed Jun 4 16:52:25 2008 UTC revision 458 by niro, Thu Jun 5 19:15:05 2008 UTC
    # Line 2  Line 2 
    2    
    3  # <niro@magellan-linux.de>  # <niro@magellan-linux.de>
    4    
    5  #%rlevels: 7:s 0:k 6:k  #%rlevels: 7:s 0:k
    6  #%start: 41  #%start: 41
    7  #%stop: 01  #%stop: 01
    8    
    # 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.2 2008-06-04 16:52:25 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 [[ ${ALX_CONFD_NETWORKING} = true ]]  
      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 153  get_system_serial() Line 145  get_system_serial()
    145   else   else
    146   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
    147   fi   fi
    148     # cleaning up old data-crap
    149     if [ -d /etc/sysconfig/hwsetup ]
    150     then
    151     echo -e ${COLOREDSTAR}"Cleaning up old data ..."
    152     rm -f /etc/sysconfig/hwsetup/*
    153     fi
    154   ALX_HW_DETECT=true   ALX_HW_DETECT=true
    155   /etc/init.d/hwdetect start   echo -en "${COLOREDSTAR}";hwsetup -p > /dev/null
    156    
    157   # set hostname to alx_default_hostname   # set hostname to alx_default_hostname
    158   # use old hostname if this is a forced re-check   # use old hostname if this is a forced re-check
    # Line 290  import_settings_to_db() Line 288  import_settings_to_db()
    288    
    289   # network   # network
    290   echo -e "      Network settings ..."   echo -e "      Network settings ..."
    291   if [[ ${ALX_CONFD_NETWORKING} = true ]]   # global settings
    292   then   mysqldo "insert into cfg_network(serial, hostname, domain )
    293   # 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}'  
      );"  
    294    
    295   # only insert the *FIRST* iface   # let udev decide which module should be loaded
    296   break   # get all devices from sysfs
    297   done   local i
    298   else   local iface
    299   mysqldo "insert into cfg_network(   for i in /sys/class/net/eth?
    300   hostname,   do
    301   serial,   iface=$(basename ${i})
    302   module,   NETCARD_DRIVER=$(source /sys/class/net/${iface}/uevent; echo ${PHYSDEVDRIVER})
    303   domain,   mysqldo "insert into cfg_interfaces(
    304   networking   serial,
    305     iface,
    306     module,
    307     networking
    308   )   )
    309   values(   values(
      '${ALX_DEFAULT_HOSTNAME}',  
    310   '${ALX_SERIAL}',   '${ALX_SERIAL}',
    311     '${iface}',
    312   '${NETCARD_DRIVER}',   '${NETCARD_DRIVER}',
      '${ALX_DEFAULT_DOMAIN}',  
    313   'dhcp'   'dhcp'
    314   );"   );"
    315   fi   done
    316   evaluate_retval   evaluate_retval
    317    
    318   # xserver   # xserver
    # Line 390  import_settings_to_db() Line 336  import_settings_to_db()
    336    
    337   # input   # input
    338   echo -e "      Input settings ..."   echo -e "      Input settings ..."
    339   mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"   mysqldo "insert into cfg_input(serial,mouse,keyboard) values('${ALX_SERIAL}','${XMOUSETYPE}','kbd');"
    340   evaluate_retval   evaluate_retval
    341    
    342   # auth   # auth
    # Line 455  update_settings_in_db() Line 401  update_settings_in_db()
    401    
    402   # network   # network
    403   echo -e "      Network settings ..."   echo -e "      Network settings ..."
    404   if [[ ${ALX_CONFD_NETWORKING} = true ]]   mysqldo "update cfg_network set
    405   then   hostname='${ALX_DEFAULT_HOSTNAME}',
    406   # get settings   domain='${ALX_DEFAULT_DOMAIN}';
    407   #source ${rc_base}/init.d/network &> /dev/null   where serial=${ALX_SERIAL};"
    408   for iface in $(onboot_interface_list ${network_settings}/net.*)  
    409   do   # let udev decide which module should be loaded
    410   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   # get all devices from sysfs
    411   echo "WARNING: only importing settings for interface [ ${iface} ] !"   local i
    412   source ${network_settings}/net.${iface} || exit 1   local iface
    413   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   for i in /sys/class/net/eth?
    414     do
    415   mysqldo "update cfg_network set   iface=$(basename ${i})
    416   hostname='${ALX_DEFAULT_HOSTNAME}',   NETCARD_DRIVER=$(source /sys/class/net/${iface}/uevent; echo ${PHYSDEVDRIVER})
    417   module='${NETCARD_DRIVER}',   mysqldo "update cfg_interfaces set
    418   domain='${ALX_DEFAULT_DOMAIN}',   iface='${iface}',
    419   networking='${NETWORKING}',   module='${NETCARD_DRIVER}',
    420   netmask='${NETMASK}',   networking='${NETWORKING}',
    421   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};"  
    422    
    423   # only insert the *FIRST* iface   # only insert the *FIRST* iface
    424   break   break
    425   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  
    426   evaluate_retval   evaluate_retval
    427    
    428   # xserver   # xserver
    # Line 515  update_settings_in_db() Line 438  update_settings_in_db()
    438    
    439   # input   # input
    440   echo -e "      Input settings ..."   echo -e "      Input settings ..."
    441   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"   mysqldo "update cfg_input set mouse='${XMOUSETYPE}', keyboard='kbd' where serial=${ALX_SERIAL};"
    442   evaluate_retval   evaluate_retval
    443  }  }
    444    
    # Line 541  import_settings_local() Line 464  import_settings_local()
    464   echo   echo
    465   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
    466    
      if [[ ${ALX_CONFD_NETWORKING} = false ]]  
      then  
      #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}  
      #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules  
       
      # set an device alias for modprobe.conf  
      [ ! -d /etc/modules.d ] && install -d /etc/modules.d  
      echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0  
       
      # regenerate modprobe.conf  
      [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"  
      evaluate_retval  
      fi  
       
    467   # set system state to 'already configured'   # set system state to 'already configured'
    468   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
    469    
    # Line 594  import_settings_local() Line 503  import_settings_local()
    503   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    504   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    505    
       
    506   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
    507   # basic config   # basic config
    508   cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc   cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
    # Line 647  preliminary_network() Line 555  preliminary_network()
    555   case $1 in   case $1 in
    556   start)   start)
    557   # keeping like always safe:   # keeping like always safe:
    558   # no network should be startet here,   # no network should be started here
    559   # so we can delete all pid files if one exists   ${rc_base}/init.d/network stop
      if ps -A|grep dhcpcd > /dev/null  
      then  
      echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}  
      dhcpcd -k  
      sleep 1  
      else  
      rm -f /var/run/dhcpcd-eth?.pid  
      fi  
      [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \  
      ${rc_base}/init.d/network stop  
    560    
    561   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
       
    562   # start network configured from /etc/conf.d   # start network configured from /etc/conf.d
    563   if [[ ${ALX_CONFD_NETWORKING} = true ]]   ${rc_base}/init.d/network start
      then  
      ${rc_base}/init.d/network start  
      else  
      echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}  
      # -t 10 timeout of 10 secs  
      dhcpcd -t 10 &> /dev/null  
      evaluate_retval  
      fi  
    564   ;;   ;;
    565    
    566   stop)   stop)
    567   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}
    568   if [[ ${ALX_CONFD_NETWORKING} = true ]]   ${rc_base}/init.d/network stop
      then  
      ${rc_base}/init.d/network stop  
      else  
      echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}  
      ifconfig eth0 down  
      fi  
      if ps -A|grep dhcpcd > /dev/null  
      then  
      dhcpcd -z  &> /dev/null  
      fi  
      evaluate_retval  
    569   ;;   ;;
    570    
    571   *)   *)
    # Line 753  reset_system_settings() Line 631  reset_system_settings()
    631   reboot   reboot
    632  }  }
    633    
     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}"  
     }  
       
    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
    # Line 873  case $1 in Line 674  case $1 in
    674   # unset_alx_connected #--> now in alxsetstate-rc6   # unset_alx_connected #--> now in alxsetstate-rc6
    675   # ! important !: del systemstate   # ! important !: del systemstate
    676   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
      sleep 0.1  
    677   ;;   ;;
    678   *)   *)
    679   echo "Usage: $0 {start|stop} ..."   echo "Usage: $0 {start|stop} ..."
    Legend:
    Removed from v.387  
    changed lines
      Added in v.458