Magellan Linux

  • Back to homepage
    • /[mage]/trunk/include/mtools.minc

    Diff of /trunk/include/mtools.minc

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

    revision 18 by niro, Thu Jun 2 18:16:14 2011 UTC revision 21 by niro, Thu Jun 2 22:39:08 2011 UTC
    # Line 49  mstopservice() Line 49  mstopservice()
    49   return   return
    50   fi   fi
    51    
    52   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
    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 85  mreloadservice() Line 85  mreloadservice()
    85   return   return
    86   fi   fi
    87    
    88   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
    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 122  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 133  mstartunit() Line 142  mstartunit()
    142   # do not start services on bootstrap or MROOT!=/   # do not start services on bootstrap or MROOT!=/
    143   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    144   then   then
    145     echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} starting unit ${service} ..."
    146   # start or restart the service   # start or restart the service
    147   systemctl try-restart ${service}   systemctl try-restart ${service}
    148   fi   fi
    # Line 161  mstopunit() Line 171  mstopunit()
    171   return   return
    172   fi   fi
    173    
    174   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
    175     then
    176     case ${service} in
    177     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    178     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    179     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    180     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    181     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    182     esac
    183     fi
    184    
    185   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
    186   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -f ${MROOT}/${service_exec} ]] && return
    # Line 175  mstopunit() Line 194  mstopunit()
    194   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    195   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    196   then   then
    197     echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} stopping unit ${service} ..."
    198   systemctl stop ${service}   systemctl stop ${service}
    199   # try harder   # try harder
    200   if [[ -n $(pidof ${service_exec}) ]]   if [[ -n $(pidof ${service_exec}) ]]
    # Line 209  mreloadunit() Line 229  mreloadunit()
    229   return   return
    230   fi   fi
    231    
    232   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
    233     then
    234     case ${service} in
    235     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    236     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    237     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    238     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    239     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    240     esac
    241     fi
    242    
    243   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    244   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    Legend:
    Removed from v.18  
    changed lines
      Added in v.21