--- trunk/core/include/mtools.sminc	2010/01/03 20:24:20	4804
+++ trunk/include/mtools.sminc	2012/01/14 01:48:34	9880
@@ -9,7 +9,7 @@
 mpname()
 {
 	local pname="${PNAME}"
-	[[ ! -z ${SPLIT_PACKAGE_BASE} ]] && pname ="${SPLIT_PACKAGE_BASE}"
+	[[ ! -z ${SPLIT_PACKAGE_BASE} ]] && pname="${SPLIT_PACKAGE_BASE}"
 
 	echo "${pname}"
 }
@@ -468,7 +468,7 @@
 
 
 # installs logrotate configuration files
-# minstallpam /path/to/logrotatefile {destfilename}
+# minstalllog /path/to/logrotatefile {destfilename}
 minstalllog()
 {
 	local logfile
@@ -585,6 +585,10 @@
 {
 	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"
 
@@ -614,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
 }
 
@@ -645,6 +649,13 @@
 		dest="$3"
 	fi
 
+	if [[ $1 = -a ]]
+	then
+		opts="--archive"
+		source="$2"
+		dest="$3"
+	fi
+
 	[[ -z ${source} ]] && die "No source given."
 	[[ -z ${dest} ]] && die "No dest given."
 
@@ -660,7 +671,7 @@
 	# force
 	if [[ $1 = -f ]]
 	then
-		opts="--recursive"
+		opts="--force"
 		source="$2"
 		dest="$3"
 	fi
@@ -741,9 +752,117 @@
 {
 	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
+}
+
+mclearconfig()
+{
+	local confdir
+	local prefix="${BINDIR}"
+	[[ -z ${MCONFIG} ]] && die "No \$MCONFIG given!"
+
+	# no bindir prefix if requested
+	case $1 in
+		-b|--no-bindir) prefix="";;
+	esac
+
+	confdir="$(dirname ${MCONFIG})"
+	if [[ ! -d ${prefix}/${confdir} ]]
+	then
+		install -d ${prefix}/${confdir} || die
+	fi
+	: > ${prefix}/${MCONFIG}
+}
+
+maddconfig()
+{
+	local argv="$1"
+	local confdir
+	local prefix="${BINDIR}"
+
+	[[ -z ${MCONFIG} ]] && die "No \$MCONFIG given!"
+
+	# no bindir prefix if requested
+	case $1 in
+		-b|--no-bindir) prefix=""; argv="$2" ;;
+	esac
+
+	[[ -z ${argv} ]] && die "No  argument given!"
+
+	confdir="$(dirname ${MCONFIG})"
+		if [[ ! -d ${prefix}/${confdir} ]]
+	then
+		install -d ${prefix}/${confdir} || die
+	fi
+	echo "${argv}" >> ${prefix}/${MCONFIG} || die
 }