--- trunk/mage/usr/lib/mage/mgroupadd	2005/02/15 22:59:14	60
+++ branches/mage-next/usr/lib/mage/mgroupadd	2014/01/29 10:42:21	2525
@@ -1,5 +1,10 @@
 #!/bin/bash
-# version: 0.3.6-r13
+# $Id$
+
+# include all needed files
+[ -f /etc/mage.rc.global ] && source /etc/mage.rc.global
+[ -f ${MAGERC} ] && source ${MAGERC}
+[ -f ${MLIBDIR}/mage4.functions.sh ] && source ${MLIBDIR}/mage4.functions.sh
 
 print_usage()
 {
@@ -13,6 +18,30 @@
 	echo
 }
 
+busybox_fix_group_opts()
+{
+	local i
+	local FIXED_GROUP_OPTS
+
+	for i in $*
+	do
+		case $1 in
+			-r) FIXED_GROUP_OPTS+=" -S" ;;
+			*) FIXED_GROUP_OPTS+=" $1" ;;
+		esac
+		shift
+	done
+
+	echo "${FIXED_GROUP_OPTS}"
+}
+
+if [[ ! -z ${MROOT} ]] && [[ ${MROOT} != / ]]
+then
+	chroot="chroot ${MROOT} "
+else
+	chroot=""
+fi
+
 while getopts "o:-" opt ; do
 	case "${opt}" in
 		o)
@@ -39,17 +68,30 @@
 
 GROUP_TO_ADD="$1"
 
-#start nscd to cache /etc/group
-$(which nscd) -i group
-# get the info
-my_group="$(getent group ${GROUP_TO_ADD})"
-
-# if above entries are empty the user/group does not exist
-if [ -z "${my_group}" ]
+# busybox support needed?
+if need_busybox_support addgroup
 then
-	echo "     Adding group '${GROUP_TO_ADD}' ..."
-	groupadd ${GROUP_OPTS} "${GROUP_TO_ADD}"
+	echo -n "     Adding group '${GROUP_TO_ADD}'"
+	[[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
+	echo " ..."
+	${chroot} addgroup -S $(busybox_fix_group_opts ${GROUP_OPTS}) "${GROUP_TO_ADD}"
+
+# normal systems
 else
-	echo "     Modifing group '${GROUP_TO_ADD}' ..."
-	groupmod ${GROUP_OPTS} "${GROUP_TO_ADD}"
+	# get the info
+	my_group="$(${chroot} getent group ${GROUP_TO_ADD})"
+
+	# if above entries are empty the user/group does not exist
+	if [ -z "${my_group}" ]
+	then
+		echo -n "     Adding group '${GROUP_TO_ADD}'"
+		[[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
+		echo " ..."
+		${chroot} groupadd -r ${GROUP_OPTS} "${GROUP_TO_ADD}"
+	else
+		echo -n "     Modifing group '${GROUP_TO_ADD}'"
+		[[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
+		echo " ..."
+		${chroot} groupmod ${GROUP_OPTS} "${GROUP_TO_ADD}"
+	fi
 fi