--- trunk/core/include/mtools.sminc	2009/12/25 18:32:07	4579
+++ branches/magellan-next/include/mtools.sminc	2011/06/02 20:53:54	7876
@@ -5,6 +5,15 @@
 # this will provide the service management functions
 INHERITS="${INHERITS} mtools"
 
+# get the pname right with splitpackages
+mpname()
+{
+	local pname="${PNAME}"
+	[[ ! -z ${SPLIT_PACKAGE_BASE} ]] && pname="${SPLIT_PACKAGE_BASE}"
+
+	echo "${pname}"
+}
+
 # installs initscripts
 # minstallrc /path/to/rc-script {destfilename}
 minstallrc()
@@ -17,7 +26,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -48,7 +57,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -79,7 +88,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -111,7 +120,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -147,7 +156,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -176,7 +185,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -205,7 +214,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -234,7 +243,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -263,7 +272,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -365,7 +374,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -403,7 +412,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -438,7 +447,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $2) ]] || [[ $(dirname $2) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$2"
+		file="${SOURCEDIR}/$(mpname)/$2"
 	else
 		file="$2"
 	fi
@@ -470,7 +479,7 @@
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$1"
+		file="${SOURCEDIR}/$(mpname)/$1"
 	else
 		file="$1"
 	fi
@@ -517,7 +526,7 @@
 
 	if [[ $1 = -s ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$2"
+		file="${SOURCEDIR}/$(mpname)/$2"
 		dest="$3"
 		if [[ -z $3 ]]
 		then
@@ -549,7 +558,7 @@
 
 	if [[ $1 = -s ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$2"
+		file="${SOURCEDIR}/$(mpname)/$2"
 		dest="$3"
 		if [[ -z $3 ]]
 		then
@@ -576,12 +585,16 @@
 {
 	local file
 	local dest
+	local verbose="-v"
+
+	# check for busybox as it doesn'tz support 'ln -v'
+	[[ $(readlink $(which ln)) = */busybox ]] && verbose=""
 
 	[[ -z $1 ]] && die "No file given"
 
 	if [[ $1 = -s ]]
 	then
-		file="${SOURCEDIR}/${PNAME}/$2"
+		file="${SOURCEDIR}/$(mpname)/$2"
 		dest="$3"
 		if [[ -z $3 ]]
 		then
@@ -605,12 +618,12 @@
 	# 1. - library.so.1.0.0 -> library.so.1.0
 	if [ "${file%.*}" != *.so ]
 	then
-		ln -v -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*})
+		ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*})
 	fi
 	# 2. - library.so.1.0.0 -> library.so.1
 	if [ "${file%.*.*}" != *.so ]
 	then
-		ln -v -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*.*})
+		ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*.*})
 	fi
 }
 
@@ -651,7 +664,7 @@
 	# force
 	if [[ $1 = -f ]]
 	then
-		opts="--recursive"
+		opts="--force"
 		source="$2"
 		dest="$3"
 	fi
@@ -732,9 +745,75 @@
 {
 	local symlink="$1"
 	local pathto="$2"
+	local verbose="-v"
+
+	# check for busybox as it doesn'tz support 'ln -v'
+	[[ $(readlink $(which ln)) = */busybox ]] && verbose=""
 
 	[[ -z ${symlink} ]] && die "No symlink given."
 	[[ -z ${pathto} ]] && die "No path given."
 
-	ln -v -snf ${symlink} ${BINDIR}/${pathto} || die
+	ln ${verbose} -snf ${symlink} ${BINDIR}/${pathto} || die
+}
+
+# installs systemd units
+# minstallunit /path/to/unit-file {destfilename}
+minstallunit()
+{
+	local unit
+	local file
+
+	[[ -z "$1" ]] && die "No unit given"
+
+	# if no fullpath given use file from sourcedir
+	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
+	then
+		file="${SOURCEDIR}/$(mpname)/$1"
+	else
+		file="$1"
+	fi
+
+	if [[ -n "$2" ]]
+	then
+		unit="$2"
+	else
+		unit="$(basename ${file})"
+	fi
+
+	# needed directory
+	install -d ${BINDIR}/lib/systemd/system || die
+
+	# install our initscript
+	install -v -m 0644 -o root -g root ${file} ${BINDIR}/lib/systemd/system/${unit} || die
+}
+
+# installs systemd tmp configs to /etc/tmpfiles.d
+# minstalltmp /path/to/tmpdfile {destfilename}
+minstalltmp()
+{
+	local tmpdfile
+	local file
+
+	[[ -z "$1" ]] && die "No tmpd file given"
+
+	# if no fullpath given use file from sourcedir
+	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
+	then
+		file="${SOURCEDIR}/$(mpname)/$1"
+	else
+		file="$1"
+	fi
+
+	if [[ -n "$2" ]]
+	then
+		tmpdfile="$2"
+	else
+		tmpdfile="$(basename ${file})"
+	fi
+
+	# needed directory
+	install -d ${BINDIR}/etc/tmpfiles.d || die
+
+	# install our tmpdfile
+	install -v -m 0644 -o root -g root ${file} ${BINDIR}/etc/tmpfiles.d/${tmpdfile} || die
 }