Magellan Linux

Diff of /trunk/include/mtools.minc

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

revision 17 by niro, Thu Jun 2 18:01:44 2011 UTC revision 29 by niro, Fri Aug 26 22:19:37 2011 UTC
# Line 1  Line 1 
1  # $Header: /magellan-cvs/mage/include/mtools.minc,v 1.3 2008/02/10 12:13:56 niro Exp $  # $Id$
2    
3  # adds services to runlevels and starts them  # adds services to runlevels and starts them
4  # mstartservice service {/path/to/service_exec}  # mstartservice service {/path/to/service_exec}
# Line 7  mstartservice() Line 7  mstartservice()
7   local service="$1"   local service="$1"
8   local service_exec="$2"   local service_exec="$2"
9    
10     # only run if sysV init was found
11     if [[ ! -f /etc/rc.d/init.d/functions ]]
12     then
13     echo "sysV init not found, not adding service ${service} to runlevels!"
14     return
15     fi
16    
17   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"
18    
19   # add service to default runlevels   # add service to default runlevels
# Line 35  mstopservice() Line 42  mstopservice()
42   local service="$1"   local service="$1"
43   local service_exec="$2"   local service_exec="$2"
44    
45   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   # only run if sysV init was found
46     if [[ ! -f /etc/rc.d/init.d/functions ]]
47     then
48     echo "sysV init not found, not adding service ${service} to runlevels!"
49     return
50     fi
51    
52     [[ -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 64  mreloadservice() Line 78  mreloadservice()
78   local service="$1"   local service="$1"
79   local service_exec="$2"   local service_exec="$2"
80    
81   [[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"   # only run if sysV init was found
82     if [[ ! -f /etc/rc.d/init.d/functions ]]
83     then
84     echo "sysV init not found, not adding service ${service} to runlevels!"
85     return
86     fi
87    
88     [[ -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 77  mreloadservice() Line 98  mreloadservice()
98   fi   fi
99  }  }
100    
   
101  # adds systemd units to runlevels and starts them  # adds systemd units to runlevels and starts them
102  # mstartunit service {/path/to/service_exec}  # mstartunit service {/path/to/service_exec}
103  mstartunit()  mstartunit()
# Line 101  mstartunit() Line 121  mstartunit()
121   return   return
122   fi   fi
123    
124   [[ -z ${service_exec} ]] && service_exec="$(which ${service})"   if [[ -z ${service_exec} ]]
125     then
126     case ${service} in
127     *.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
128     *.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
129     *.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
130     *.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
131     *) service_exec="$(which ${service} 2> /dev/null)" ;;
132     esac
133     fi
134    
135   # add service to default runlevels   # add service to default runlevels
136   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 112  mstartunit() Line 141  mstartunit()
141   # do not start services on bootstrap or MROOT!=/   # do not start services on bootstrap or MROOT!=/
142   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
143   then   then
144     echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} starting unit ${service} ..."
145   # start or restart the service   # start or restart the service
146   systemctl try-restart ${service}   # dont use try-restart, works only with active services!
147     systemctl restart ${service}
148   fi   fi
149  }  }
150    
# Line 140  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 154  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 188  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     # reload daemon to honor changed unit files
244     systemctl daemon-reload
245    
246   # do not stop services on bootstrap or MROOT!=/   # do not stop services on bootstrap or MROOT!=/
247   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]

Legend:
Removed from v.17  
changed lines
  Added in v.29