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 2156 by niro, Tue May 17 21:41:48 2011 UTC revision 2748 by niro, Thu Aug 11 19:51:11 2011 UTC
    # Line 30  source /usr/lib/alxconfig-ng/functions/c Line 30  source /usr/lib/alxconfig-ng/functions/c
    30  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source /usr/lib/alxconfig-ng/functions/mysqlfunctions
    31  source /usr/lib/alxconfig-ng/functions/serial_functions  source /usr/lib/alxconfig-ng/functions/serial_functions
    32  source /usr/lib/alxconfig-ng/functions/config_modules  source /usr/lib/alxconfig-ng/functions/config_modules
    33    source /usr/lib/alxconfig-ng/functions/config_plugins
    34  source /usr/lib/alxconfig-ng/functions/config_network  source /usr/lib/alxconfig-ng/functions/config_network
    35  source /usr/lib/alxconfig-ng/functions/config_printers  source /usr/lib/alxconfig-ng/functions/config_printers
    36  source /usr/lib/alxconfig-ng/functions/config_sessions  source /usr/lib/alxconfig-ng/functions/config_sessions
    # Line 51  unset ALX_SERIAL ALX_STATE Line 52  unset ALX_SERIAL ALX_STATE
    52  # setup needed directories  # setup needed directories
    53  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
    54    
       
     # read_cmdline ${item}  
     read_cmdline()  
     {  
      local i  
       
      for i in $(< /proc/cmdline)  
      do  
      [[ ${i} = $1 ]] && return 0  
      done  
       
      return 1  
     }  
       
    55  update_system_settings()  update_system_settings()
    56  {  {
    57   rc_mecho Checking system setup ...   rc_mecho Checking system setup ...
    # Line 73  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 179  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 434  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 565  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 588  import_settings_local() Line 587  import_settings_local()
    587   # now generate fluxbox config files   # now generate fluxbox config files
    588    
    589   # fluxbox main config   # fluxbox main config
    590   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   local fbinit
    591     if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    592     then
    593     fbinit="${ALX_SKELETONS}/fluxbox/init"
    594     else
    595     fbinit="/usr/share/fluxbox/init"
    596     fi
    597     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    598    
    599   # fluxbox autostart   # fluxbox autostart
    600   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    601     # do not show decorations on messages generated with xmessage
    602     if [ -x /usr/bin/xmessage ]
    603     then
    604     addconfig '[app] (xmessage)'
    605     addconfig ' [Deco] {NONE}'
    606     addconfig '[end]'
    607     fi
    608     # add icon utility
    609     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    610     # add numlock utility
    611     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    612    
    613     # fluxbox hotkeys
    614     local fbkeys
    615     if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    616     then
    617     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    618     else
    619     fbkeys="/usr/share/fluxbox/keys"
    620     fi
    621     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    622    
    623   # fluxbox menu header   # fluxbox menu header
    624   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
    # Line 609  import_settings_local() Line 636  import_settings_local()
    636   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    637   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    638    
       
    639   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    640   # clean desktop icon location   # clean desktop icon location
    641   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop
    642   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.idesktop
    643    
    644     # add shutdown, reboot icons
    645     local name
    646     # default settings
    647     declare -i x=30
    648     declare -i y=30
    649     for i in shutdown reboot
    650     do
    651     case ${i} in
    652     shutdown) name="Herunterfahren" ;;
    653     reboot) name="Neustarten" ;;
    654     esac
    655    
    656     generate_icon \
    657     --name "${name}" \
    658     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    659     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    660     --dest "${dest}/${i}.lnk" \
    661     --xres "${x}" \
    662     --yres "${y}"
    663    
    664     y=$((${y} + 80))
    665     done
    666    
    667   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    668   local sysinfo   local sysinfo
    # Line 638  import_settings_local() Line 684  import_settings_local()
    684   --name "${sysinfo}" \   --name "${sysinfo}" \
    685   --command "exit 0" \   --command "exit 0" \
    686   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    687   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \
    688   --xres "${xres}" \   --xres "${xres}" \
    689   --yres "${yres}" \   --yres "${yres}" \
    690   --icon-width "1" \   --icon-width "1" \
    691   --icon-height "1"   --icon-height "1"
    692    
      # create a xinitrc  
      echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc  
       
    693   # set correct permissions   # set correct permissions
    694   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    695   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    696   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    697   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    698   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   if [ -f ${ALX_UNPRIV_HOME}/.ideskrc ]
    699   chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc   then
    700     chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    701     fi
    702  }  }
    703    
    704  # start|stop  # start|stop
    # Line 702  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   ;;   ;;
    Legend:
    Removed from v.2156  
    changed lines
      Added in v.2748