Magellan Linux

  • Back to homepage
    • /[mage]/branches/magellan-next/include/mtools.minc

    Diff of /branches/magellan-next/include/mtools.minc

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

    revision 19 by niro, Thu Jun 2 21:21:16 2011 UTC revision 20 by niro, Thu Jun 2 21:36:05 2011 UTC
    # Line 14  mstartservice() Line 14  mstartservice()
    14   return   return
    15   fi   fi
    16    
    17   if [[ -z ${service_exec} ]]   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
      then  
      case ${service} in  
      *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;  
      *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;  
      *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;  
      *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;  
      *) service_exec="$(which ${service} 2> /dev/null)" ;;  
      esac  
      fi  
    18    
    19   # add service to default runlevels   # add service to default runlevels
    20   echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding ${service} to default runlevels ..."   echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding ${service} to default runlevels ..."
    # Line 58  mstopservice() Line 49  mstopservice()
    49   return   return
    50   fi   fi
    51    
    52   if [[ -z ${service_exec} ]]   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
      then  
      case ${service} in  
      *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;  
      *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;  
      *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;  
      *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;  
      *) service_exec="$(which ${service} 2> /dev/null)" ;;  
      esac  
      fi  
    53    
    54   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
    55   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -f ${MROOT}/${service_exec} ]] && return
    # Line 103  mreloadservice() Line 85  mreloadservice()
    85   return   return
    86   fi   fi
    87    
    88   if [[ -z ${service_exec} ]]   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
      then  
      case ${service} in  
      *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;  
      *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;  
      *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;  
      *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;  
      *) service_exec="$(which ${service} 2> /dev/null)" ;;  
      esac  
      fi  
    89    
    90   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    91   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    # Line 149  mstartunit() Line 122  mstartunit()
    122   return   return
    123   fi   fi
    124    
    125   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   if [[ -z ${service_exec} ]]
    126     then
    127     case ${service} in
    128     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    129     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    130     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    131     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    132     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    133     esac
    134     fi
    135    
    136   # add service to default runlevels   # add service to default runlevels
    137   echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding unit ${service} to default runlevels ..."   echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding unit ${service} to default runlevels ..."
    # Line 188  mstopunit() Line 170  mstopunit()
    170   return   return
    171   fi   fi
    172    
    173   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
    174     then
    175     case ${service} in
    176     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    177     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    178     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    179     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    180     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    181     esac
    182     fi
    183    
    184   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
    185   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -f ${MROOT}/${service_exec} ]] && return
    # Line 236  mreloadunit() Line 227  mreloadunit()
    227   return   return
    228   fi   fi
    229    
    230   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
    231     then
    232     case ${service} in
    233     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    234     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    235     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    236     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    237     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    238     esac
    239     fi
    240    
    241   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    242   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    Legend:
    Removed from v.19  
    changed lines
      Added in v.20