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 2141 by niro, Tue May 17 10:51:57 2011 UTC revision 2509 by niro, Thu Jun 30 14:44:36 2011 UTC
    # Line 51  unset ALX_SERIAL ALX_STATE Line 51  unset ALX_SERIAL ALX_STATE
    51  # setup needed directories  # setup needed directories
    52  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
    53    
       
     # read_cmdline ${item}  
     read_cmdline()  
     {  
      local i  
       
      for i in $(< /proc/cmdline)  
      do  
      [[ ${i} = $1 ]] && return 0  
      done  
       
      return 1  
     }  
       
    54  update_system_settings()  update_system_settings()
    55  {  {
    56   echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}   rc_mecho Checking system setup ...
    57    
    58   # get the modules settings   # get the modules settings
    59   # ! is the first thing that must be configured !   # ! is the first thing that must be configured !
    # Line 179  get_system_serial() Line 165  get_system_serial()
    165   fi   fi
    166    
    167    
    168   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
    169   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
    170   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    171    
    172   # abort now if this is a forced re-check   # abort now if this is a forced re-check
    # Line 565  import_settings_local() Line 551  import_settings_local()
    551   then   then
    552   # set an device alias for modprobe.conf   # set an device alias for modprobe.conf
    553   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
    554   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf   # update only if not the same (to speed up bootprocess - no depmod)
    555     CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
    556     clearconfig
    557     addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
    558    
    559     # update confd-networking default iface
    560     [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
    561     CONFIG="${SETTINGSPATH}/confd-networking"
    562     clearconfig
    563     addconfig "${ALX_IFACE}"
    564    
    565   # regenerate modprobe.conf   # regenerate modprobe.conf
    566   [ -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 583  import_settings_local()
    583   # now generate fluxbox config files   # now generate fluxbox config files
    584    
    585   # fluxbox main config   # fluxbox main config
    586   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   local fbinit
    587     if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    588     then
    589     fbinit="${ALX_SKELETONS}/fluxbox/init"
    590     else
    591     fbinit="/usr/share/fluxbox/init"
    592     fi
    593     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    594    
    595   # fluxbox autostart   # fluxbox autostart
    596   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    597     # do not show decorations on messages generated with xmessage
    598     if [ -x /usr/bin/xmessage ]
    599     then
    600     addconfig '[app] (xmessage)'
    601     addconfig ' [Deco] {NONE}'
    602     addconfig '[end]'
    603     fi
    604     # add icon utility
    605     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    606     # add numlock utility
    607     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    608    
    609     # fluxbox hotkeys
    610     local fbkeys
    611     if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    612     then
    613     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    614     else
    615     fbkeys="/usr/share/fluxbox/keys"
    616     fi
    617     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    618    
    619   # fluxbox menu header   # fluxbox menu header
    620   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 632  import_settings_local()
    632   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    633   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    634    
       
    635   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    636   # clean desktop icon location   # clean desktop icon location
    637   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop
    638   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.idesktop
    639    
    640     # add shutdown, reboot icons
    641     local name
    642     # default settings
    643     declare -i x=30
    644     declare -i y=30
    645     for i in shutdown reboot
    646     do
    647     case ${i} in
    648     shutdown) name="Herunterfahren" ;;
    649     reboot) name="Neustarten" ;;
    650     esac
    651    
    652     generate_icon \
    653     --name "${name}" \
    654     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    655     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    656     --dest "${dest}/${i}.lnk" \
    657     --xres "${x}" \
    658     --yres "${y}"
    659    
    660     y=$((${y} + 80))
    661     done
    662    
    663   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    664   local sysinfo   local sysinfo
    # Line 638  import_settings_local() Line 680  import_settings_local()
    680   --name "${sysinfo}" \   --name "${sysinfo}" \
    681   --command "exit 0" \   --command "exit 0" \
    682   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    683   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \
    684   --xres "${xres}" \   --xres "${xres}" \
    685   --yres "${yres}" \   --yres "${yres}" \
    686   --icon-width "1" \   --icon-width "1" \
    687   --icon-height "1"   --icon-height "1"
    688    
      # create a xinitrc  
      echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc  
       
    689   # set correct permissions   # set correct permissions
    690   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    691   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    692   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    693   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    694   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   if [ -f ${ALX_UNPRIV_HOME}/.ideskrc ]
    695   chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc   then
    696     chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    697     fi
    698  }  }
    699    
    700  # start|stop  # start|stop
    # Line 686  preliminary_network() Line 727  preliminary_network()
    727   # keeping like always safe:   # keeping like always safe:
    728   # no network should be startet here,   # no network should be startet here,
    729   # so we can delete all pid files if one exists   # so we can delete all pid files if one exists
    730   if [[ ! -z $(pidof udhcpc) ]]   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
    731   then   then
    732   rc_mecho "Forcing network down"   rc_mecho "Forcing network down"
    733   killall udhcpc &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
    734   sleep 1   sleep 1
    735   fi   fi
    736   [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop   [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
    # Line 702  preliminary_network() Line 743  preliminary_network()
    743   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    744   else   else
    745   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
    746   # -t 10 timeout of 10 secs   ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
      udhcpc -t 10 &> /dev/null  
    747   evaluate_retval   evaluate_retval
    748   fi   fi
    749   ;;   ;;
    # Line 715  preliminary_network() Line 755  preliminary_network()
    755   ${rc_base}/init.d/network stop   ${rc_base}/init.d/network stop
    756   else   else
    757   rc_print "Stopping default dhcp based networking ... "   rc_print "Stopping default dhcp based networking ... "
    758   ifconfig eth0 down   ifconfig ${ALX_IFACE} down
    759   fi   fi
    760   if [[ ! -z $(pidof udhcpc) ]]   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
    761   then   then
    762   killall udhcpc  &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
    763   sleep 1   sleep 1
    764   fi   fi
    765   evaluate_retval   evaluate_retval
    Legend:
    Removed from v.2141  
    changed lines
      Added in v.2509