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 2153 by niro, Tue May 17 21:34:21 2011 UTC revision 2382 by niro, Tue Jun 14 13:51:37 2011 UTC
    # Line 609  import_settings_local() Line 609  import_settings_local()
    609   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    610   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    611    
       
    612   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    613   # clean desktop icon location   # clean desktop icon location
    614   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
    615   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.xtdesktop
    616    
    617     # basic config
    618     cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
    619    
    620   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    621   local sysinfo   local sysinfo
    622   local osversion   local osversion
    # Line 686  preliminary_network() Line 685  preliminary_network()
    685   # keeping like always safe:   # keeping like always safe:
    686   # no network should be startet here,   # no network should be startet here,
    687   # so we can delete all pid files if one exists   # so we can delete all pid files if one exists
    688   if [[ ! -z $(pidof udhcpc) ]]   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
    689   then   then
    690   rc_mecho "Forcing network down"   rc_mecho "Forcing network down"
    691   killall udhcpc &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
    692   sleep 1   sleep 1
    693   fi   fi
    694   [[ ${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 701  preliminary_network()
    701   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    702   else   else
    703   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
    704   # -t 10 timeout of 10 secs   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null
      udhcpc -t 10 &> /dev/null  
    705   evaluate_retval   evaluate_retval
    706   fi   fi
    707   ;;   ;;
    # Line 715  preliminary_network() Line 713  preliminary_network()
    713   ${rc_base}/init.d/network stop   ${rc_base}/init.d/network stop
    714   else   else
    715   rc_print "Stopping default dhcp based networking ... "   rc_print "Stopping default dhcp based networking ... "
    716   ifconfig eth0 down   ifconfig ${ALX_IFACE} down
    717   fi   fi
    718   if [[ ! -z $(pidof udhcpc) ]]   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
    719   then   then
    720   killall udhcpc  &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
    721   sleep 1   sleep 1
    722   fi   fi
    723   evaluate_retval   evaluate_retval
    Legend:
    Removed from v.2153  
    changed lines
      Added in v.2382