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 33 by niro, Tue Dec 13 17:33:23 2011 UTC revision 34 by niro, Fri Jan 13 02:29:33 2012 UTC
    # Line 14  mstartservice() Line 14  mstartservice()
    14   return   return
    15   fi   fi
    16    
    17     # don't run if feature !autosvc was set
    18     if mqueryfeature "!autosvc"
    19     then
    20     echo "!autosvc detected; auto management of services disabled."
    21     return
    22     fi
    23    
    24   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
    25    
    26   # add service to default runlevels   # add service to default runlevels
    # Line 49  mstopservice() Line 56  mstopservice()
    56   return   return
    57   fi   fi
    58    
    59   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   # don't run if feature !autosvc was set
    60     if mqueryfeature "!autosvc"
    61     then
    62     echo "!autosvc detected; auto management of services disabled."
    63     return
    64     fi
    65    
    66     if [[ -z ${service_exec} ]]
    67     then
    68     service_exec="$(which ${service})"
    69     elif [[ x$(basename ${service_exec}) = x${service_exec} ]]
    70     then
    71     # expand full path
    72     service_exec="$(which ${service_exec})"
    73     fi
    74    
    75   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
    76   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -x ${MROOT}/${service_exec} ]] && return
    77    
    78   # del services from runlevel regardless if they exist or not   # del services from runlevel regardless if they exist or not
    79   echo -e " ${COLBLUE}[${COLRED}-${COLBLUE}]${COLDEFAULT} removing ${service} from default runlevels ..."   echo -e " ${COLBLUE}[${COLRED}-${COLBLUE}]${COLDEFAULT} removing ${service} from default runlevels ..."
    # Line 85  mreloadservice() Line 106  mreloadservice()
    106   return   return
    107   fi   fi
    108    
    109     # don't run if feature !autosvc was set
    110     if mqueryfeature "!autosvc"
    111     then
    112     echo "!autosvc detected; auto management of services disabled."
    113     return
    114     fi
    115    
    116   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
    117    
    118   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
    # Line 113  mstartunit() Line 141  mstartunit()
    141   return   return
    142   fi   fi
    143    
    144     # don't run if feature !autosvc was set
    145     if mqueryfeature "!autosvc"
    146     then
    147     echo "!autosvc detected; auto management of services disabled."
    148     return
    149     fi
    150    
    151   if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]   if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
    152   then   then
    153   opts="--root ${MROOT}"   opts="--root ${MROOT}"
    # Line 160  mstopunit() Line 195  mstopunit()
    195   return   return
    196   fi   fi
    197    
    198     # don't run if feature !autosvc was set
    199     if mqueryfeature "!autosvc"
    200     then
    201     echo "!autosvc detected; auto management of services disabled."
    202     return
    203     fi
    204    
    205   if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]   if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
    206   then   then
    207   opts="--root ${MROOT}"   opts="--root ${MROOT}"
    # Line 174  mstopunit() Line 216  mstopunit()
    216   *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;   *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
    217   *) service_exec="$(which ${service} 2> /dev/null)" ;;   *) service_exec="$(which ${service} 2> /dev/null)" ;;
    218   esac   esac
    219     elif [[ x$(basename ${service_exec}) = x${service_exec} ]]
    220     then
    221     # expand full path
    222     service_exec="$(which ${service_exec})"
    223   fi   fi
    224    
    225   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
    226   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -x ${MROOT}/${service_exec} ]] && return
    227    
    228   # del services from runlevel regardless if they exist or not   # del services from runlevel regardless if they exist or not
    229   echo -e " ${COLBLUE}[${COLRED}-${COLBLUE}]${COLDEFAULT} removing unit ${service} from default runlevels ..."   echo -e " ${COLBLUE}[${COLRED}-${COLBLUE}]${COLDEFAULT} removing unit ${service} from default runlevels ..."
    # Line 215  mreloadunit() Line 261  mreloadunit()
    261   return   return
    262   fi   fi
    263    
    264     # don't run if feature !autosvc was set
    265     if mqueryfeature "!autosvc"
    266     then
    267     echo "!autosvc detected; auto management of services disabled."
    268     return
    269     fi
    270    
    271   if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]   if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
    272   then   then
    273   opts="--root ${MROOT}"   opts="--root ${MROOT}"
    Legend:
    Removed from v.33  
    changed lines
      Added in v.34