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 19 by niro, Thu Jun 2 21:21:16 2011 UTC revision 28 by niro, Fri Aug 26 22:18:48 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 160  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}   # dont use try-restart, works only with active services!
    148     systemctl restart ${service}
    149   fi   fi
    150  }  }
    151    
    # Line 188  mstopunit() Line 172  mstopunit()
    172   return   return
    173   fi   fi
    174    
    175   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
    176     then
    177     case ${service} in
    178     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    179     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    180     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    181     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    182     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    183     esac
    184     fi
    185    
    186   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
    187   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -f ${MROOT}/${service_exec} ]] && return
    # Line 202  mstopunit() Line 195  mstopunit()
    195   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    196   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    197   then   then
    198     echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} stopping unit ${service} ..."
    199   systemctl stop ${service}   systemctl stop ${service}
    200   # try harder   # try harder
    201   if [[ -n $(pidof ${service_exec}) ]]   if [[ -n $(pidof ${service_exec}) ]]
    # Line 236  mreloadunit() Line 230  mreloadunit()
    230   return   return
    231   fi   fi
    232    
    233   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
    234     then
    235     case ${service} in
    236     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
    237     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
    238     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
    239     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    240     *) service_exec="$(which ${service} 2> /dev/null)" ;;
    241     esac
    242     fi
    243    
    244     # reload daemon to honor changed unit files
    245     systemctl daemon-reload
    246    
    247   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    248   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    Legend:
    Removed from v.19  
    changed lines
      Added in v.28