Magellan Linux

Diff of /branches/magellan-next/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 19 by niro, Thu Jun 2 21:21:16 2011 UTC
# Line 14  mstartservice() Line 14  mstartservice()
14   return   return
15   fi   fi
16    
17   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   if [[ -z ${service_exec} ]]
18     then
19     case ${service} in
20     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
21     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
22     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
23     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
24     *) service_exec="$(which ${service} 2> /dev/null)" ;;
25     esac
26     fi
27    
28   # add service to default runlevels   # add service to default runlevels
29   echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding ${service} to default runlevels ..."   echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding ${service} to default runlevels ..."
# Line 49  mstopservice() Line 58  mstopservice()
58   return   return
59   fi   fi
60    
61   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
62     then
63     case ${service} in
64     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
65     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
66     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
67     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
68     *) service_exec="$(which ${service} 2> /dev/null)" ;;
69     esac
70     fi
71    
72   # only stop the service if ${service_exec} does not exist   # only stop the service if ${service_exec} does not exist
73   [[ -f ${MROOT}/${service_exec} ]] && return   [[ -f ${MROOT}/${service_exec} ]] && return
# Line 85  mreloadservice() Line 103  mreloadservice()
103   return   return
104   fi   fi
105    
106   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   if [[ -z ${service_exec} ]]
107     then
108     case ${service} in
109     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
110     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
111     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
112     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
113     *) service_exec="$(which ${service} 2> /dev/null)" ;;
114     esac
115     fi
116    
117   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
118   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]

Legend:
Removed from v.18  
changed lines
  Added in v.19