/[mage]/trunk/include/mtools.minc

Diff of /trunk/include/mtools.minc

Parent Directory | Revision Log | View Patch Patch

-branches/magellan-next/include/mtools.minc
revision 20 by niro,
Thu Jun  2 21:36:05 2011 UTC
+trunk/include/mtools.minc
revision 63 by niro,
Wed Oct  9 12:23:06 2013 UTC
 Line 14 
 mstartservice()
  		return
  	fi
+ 	# don't run if feature !autosvc was set
+ 	if mqueryfeature "!autosvc"
+ 	then
+ 		echo "!autosvc detected; auto management of services disabled."
+ 		return
+ 	fi
  	[[ -z ${service_exec} ]] && service_exec="$(which ${service})"
  	# add service to default runlevels
-Line 49 
 mstopservice()
+Line 56 
 mstopservice()
  		return
  	fi
- 	[[ -z ${service_exec} ]] && service_exec="$(which ${service})"
+ 	# don't run if feature !autosvc was set
+ 	if mqueryfeature "!autosvc"
+ 	then
+ 		echo "!autosvc detected; auto management of services disabled."
+ 		return
+ 	fi
+ 	if [[ -z ${service_exec} ]]
+ 	then
+ 		service_exec="$(which ${service})"
+ 	elif [[ x$(basename ${service_exec}) = x${service_exec} ]]
+ 	then
+ 		# expand full path
+ 		service_exec="$(which ${service_exec})"
+ 	fi
  	# only stop the service if ${service_exec} does not exist
- 	[[ -f ${MROOT}/${service_exec} ]] && return
+ 	[[ -x ${MROOT}/${service_exec} ]] && return
  	# del services from runlevel regardless if they exist or not
  	echo -e " ${COLBLUE}[${COLRED}-${COLBLUE}]${COLDEFAULT} removing ${service} from default runlevels ..."
-Line 85 
 mreloadservice()
+Line 106 
 mreloadservice()
  		return
  	fi
+ 	# don't run if feature !autosvc was set
+ 	if mqueryfeature "!autosvc"
+ 	then
+ 		echo "!autosvc detected; auto management of services disabled."
+ 		return
+ 	fi
  	[[ -z ${service_exec} ]] && service_exec="$(which ${service})"
  	# do not stop services on bootstrap or MROOT!=/
-Line 98 
 mreloadservice()
+Line 126 
 mreloadservice()
  	fi
  }
  # adds systemd units to runlevels and starts them
  # mstartunit service {/path/to/service_exec}
  mstartunit()
  {
  	local service="$1"
  	local service_exec="$2"
+ 	local opts
+ 	local chroot
  	# only run if systemd was found
- 	if [[ ! -x /bin/systemctl ]]
+ 	if [[ ! -x /bin/systemctl ]] && [[ ! -x /usr/bin/systemctl ]]
  	then
  		echo "systemd not found, not adding unit ${service} to runlevels!"
  		return
  	fi
- 	# we do not support $MROOT atm
+ 	# don't run if feature !autosvc was set
- 	if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
+ 	if mqueryfeature "!autosvc"
  	then
- 		echo "\$MROOT is set, doing nothing!"
+ 		echo "!autosvc detected; auto management of services disabled."
- 		echo "Please add unit ${service} manually to the runlevels!"
- 		echo "Run 'systemctl enable ${service}' in your chroot later on."
  		return
  	fi
+ 	if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
+ 	then
+ 		# symlinks root path too, not exactly what we want
+ 		#opts="--root ${MROOT}"
+ 		if [ -x $(type -P systemd-nspawn) ]
+ 		then
+ 			chroot="$(type -P systemd-nspawn)"
+ 		else
+ 			chroot="chroot"
+ 		fi
+ 	fi
  	if [[ -z ${service_exec} ]]
  	then
  		case ${service} in
-Line 136 
 mstartunit()
+Line 175 
 mstartunit()
  	# add service to default runlevels
  	echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding unit ${service} to default runlevels ..."
  	# reload daemon to honor changed unit files
- 	systemctl daemon-reload
+ 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
- 	systemctl enable ${service}
+ 	then
+ 		systemctl ${opts} daemon-reload
+ 	fi
+ 	${chroot} systemctl ${opts} enable ${service}
  	# do not start services on bootstrap or MROOT!=/
  	if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
  	then
+ 		echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} starting unit ${service} ..."
  		# start or restart the service
- 		systemctl try-restart ${service}
+ 		# dont use try-restart, works only with active services!
+ 		systemctl restart ${service}
  	fi
  }
-Line 153 
 mstopunit()
+Line 197 
 mstopunit()
  {
  	local service="$1"
  	local service_exec="$2"
+ 	local opts
  	# only run if systemd was found
- 	if [[ ! -x /bin/systemctl ]]
+ 	if [[ ! -x /bin/systemctl ]] && [[ ! -x /usr/bin/systemctl ]]
  	then
  		echo "systemd not found, not removing unit ${service} from runlevels!"
  		return
  	fi
- 	# we do not support $MROOT atm
+ 	# don't run if feature !autosvc was set
- 	if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
+ 	if mqueryfeature "!autosvc"
  	then
- 		echo "\$MROOT is set, doing nothing!"
+ 		echo "!autosvc detected; auto management of services disabled."
- 		echo "Please remove unit ${service} manually from the runlevels!"
- 		echo "Run 'systemctl disable ${service}' in your chroot later on."
  		return
  	fi
+ 	if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
+ 	then
+ 		opts="--root ${MROOT}"
+ 	fi
  	if [[ -z ${service_exec} ]]
  	then
  		case ${service} in
-Line 179 
 mstopunit()
+Line 227 
 mstopunit()
  			*.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
  			*) service_exec="$(which ${service} 2> /dev/null)" ;;
  		esac
+ 	elif [[ x$(basename ${service_exec}) = x${service_exec} ]]
+ 	then
+ 		# expand full path
+ 		service_exec="$(which ${service_exec})"
  	fi
  	# only stop the service if ${service_exec} does not exist
- 	[[ -f ${MROOT}/${service_exec} ]] && return
+ 	[[ -x ${MROOT}/${service_exec} ]] && return
  	# del services from runlevel regardless if they exist or not
  	echo -e " ${COLBLUE}[${COLRED}-${COLBLUE}]${COLDEFAULT} removing unit ${service} from default runlevels ..."
  	# reload daemon to honor changed unit files
- 	systemctl daemon-reload
+ 	systemctl ${opts} daemon-reload
- 	systemctl disable ${service}
+ 	systemctl ${opts} disable ${service}
  	# do not stop services on bootstrap or MROOT!=/
  	if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
  	then
+ 		echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} stopping unit ${service} ..."
  		systemctl stop ${service}
  		# try harder
  		if [[ -n $(pidof ${service_exec}) ]]
-Line 210 
 mreloadunit()
+Line 263 
 mreloadunit()
  {
  	local service="$1"
  	local service_exec="$2"
+ 	local opts
  	# only run if systemd was found
- 	if [[ ! -x /bin/systemctl ]]
+ 	if [[ ! -x /bin/systemctl ]] && [[ ! -x /usr/bin/systemctl ]]
  	then
  		echo "systemd not found, not removing unit ${service} from runlevels!"
  		return
  	fi
- 	# we do not support $MROOT atm
+ 	# don't run if feature !autosvc was set
- 	if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
+ 	if mqueryfeature "!autosvc"
  	then
- 		echo "\$MROOT is set, doing nothing!"
+ 		echo "!autosvc detected; auto management of services disabled."
- 		echo "Please remove unit ${service} manually from the runlevels!"
- 		echo "Run 'systemctl disable ${service}' in your chroot later on."
  		return
  	fi
+ 	if [[ ${MROOT} != / ]] && [[ ! -z ${MROOT} ]]
+ 	then
+ 		opts="--root ${MROOT}"
+ 	fi
  	if [[ -z ${service_exec} ]]
  	then
  		case ${service} in
-Line 238 
 mreloadunit()
+Line 295 
 mreloadunit()
  		esac
  	fi
+ 	# reload daemon to honor changed unit files
+ 	systemctl ${opts} daemon-reload
  	# do not stop services on bootstrap or MROOT!=/
  	if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
  	then

 Legend:



Removed from v.20
 


changed lines


 
Added in v.63
 Legend:



Removed from v.20
 


changed lines


 
Added in v.63
-Removed from v.20
+Added in v.63