Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/init.d/alxsettings

    Diff of /alx-src/branches/alxconf-060/init.d/alxsettings

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

    revision 2479 by niro, Mon Jun 27 15:20:33 2011 UTC revision 3456 by niro, Fri Apr 13 17:07:51 2012 UTC
    # Line 26  source $rc_functions Line 26  source $rc_functions
    26  source /etc/alxconfig-ng/config.rc  source /etc/alxconfig-ng/config.rc
    27    
    28  # helper functions  # helper functions
    29  source /usr/lib/alxconfig-ng/functions/common  source ${ALX_FUNCTIONS}/common
    30  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source ${ALX_FUNCTIONS}/mysqlfunctions
    31  source /usr/lib/alxconfig-ng/functions/serial_functions  source ${ALX_FUNCTIONS}/serial_functions
    32  source /usr/lib/alxconfig-ng/functions/config_modules  source ${ALX_FUNCTIONS}/config_modules
    33  source /usr/lib/alxconfig-ng/functions/config_network  source ${ALX_FUNCTIONS}/config_plugins
    34  source /usr/lib/alxconfig-ng/functions/config_printers  source ${ALX_FUNCTIONS}/config_network
    35  source /usr/lib/alxconfig-ng/functions/config_sessions  source ${ALX_FUNCTIONS}/config_printers
    36  source /usr/lib/alxconfig-ng/functions/config_x11  source ${ALX_FUNCTIONS}/config_sessions
    37  source /usr/lib/alxconfig-ng/functions/config_auth  source ${ALX_FUNCTIONS}/config_x11
    38  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source ${ALX_FUNCTIONS}/config_auth
    39  source /usr/lib/alxconfig-ng/functions/config_versions  source ${ALX_FUNCTIONS}/config_ssh_auth
    40    source ${ALX_FUNCTIONS}/config_versions
    41    
    42  # other needed vars  # other needed vars
    43  ALX_HW_DETECT=false  ALX_HW_DETECT=false
    # Line 59  update_system_settings() Line 60  update_system_settings()
    60   # ! is the first thing that must be configured !   # ! is the first thing that must be configured !
    61   config_modules   config_modules
    62    
    63     # install or uninstall plugins
    64     config_plugins
    65    
    66   # imports network settings from db   # imports network settings from db
    67   config_networking   config_networking
    68    
    # Line 165  get_system_serial() Line 169  get_system_serial()
    169   fi   fi
    170    
    171    
    172   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
    173   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
    174   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    175    
    176   # abort now if this is a forced re-check   # abort now if this is a forced re-check
    # Line 420  import_settings_to_db() Line 424  import_settings_to_db()
    424   local alx_os   local alx_os
    425   local alx_utils   local alx_utils
    426   alx_os="$(< /etc/mageversion)"   alx_os="$(< /etc/mageversion)"
    427   alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"   alx_utils="$(magequery -n alxconfig-ng | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
    428   alx_utils="${alx_utils/alxconfig-ng-alx-}"   alx_utils="${alx_utils/alxconfig-ng-}"
    429   mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"   mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
    430    
    431   evaluate_retval   evaluate_retval
    # Line 551  import_settings_local() Line 555  import_settings_local()
    555   then   then
    556   # set an device alias for modprobe.conf   # set an device alias for modprobe.conf
    557   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
    558   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf   # update only if not the same (to speed up bootprocess - no depmod)
    559     CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
    560     clearconfig
    561     addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
    562    
    563     # update confd-networking default iface
    564     [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
    565     CONFIG="${SETTINGSPATH}/confd-networking"
    566     clearconfig
    567     addconfig "${ALX_IFACE}"
    568    
    569   # regenerate modprobe.conf   # regenerate modprobe.conf
    570   [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"   [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"
    # Line 734  preliminary_network() Line 747  preliminary_network()
    747   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    748   else   else
    749   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
    750   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null   ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
    751   evaluate_retval   evaluate_retval
    752   fi   fi
    753   ;;   ;;
    # Line 799  reset_system_settings() Line 812  reset_system_settings()
    812   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
    813    
    814   # remove all ica-sessions   # remove all ica-sessions
    815   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs rm   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm
    816    
    817   # remove all old nics and modules configs   # remove all old nics and modules configs
    818   find /etc/conf.d -type f -name 'net.*' | xargs rm   find /etc/conf.d -type f -name 'net.*' | xargs --no-run-if-empty rm
    819   find /etc/modprobe.d -type f -name 'net.*' | xargs rm   find /etc/modprobe.d -type f -name 'net.*' | xargs --no-run-if-empty rm
    820    
    821   # restore default networking   # restore default networking
    822   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
    Legend:
    Removed from v.2479  
    changed lines
      Added in v.3456