--- trunk/mage/usr/lib/mage/mgroupdel	2011/04/27 09:45:07	1273
+++ branches/mage-next/src/helper/mgroupdel.in	2014/01/29 12:04:16	2552
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mgroupdel,v 1.4 2005-06-01 15:48:40 niro Exp $
+# $Id$
 
 # include all needed files
 [ -f /etc/mage.rc.global ] && source /etc/mage.rc.global
@@ -16,6 +16,13 @@
 	echo
 }
 
+if [[ ! -z ${MROOT} ]] && [[ ${MROOT} != / ]]
+then
+	chroot="chroot ${MROOT} "
+else
+	chroot=""
+fi
+
 #exit if $1 is zero
 if [ -z "$1" ]
 then
@@ -28,21 +35,25 @@
 # busybox support needed?
 if need_busybox_support delgroup
 then
-	echo "     Deleting user '${GROUP_TO_DEL}' ..."
-	delgroup "${GROUP_TO_DEL}"
+	echo -n "     Deleting user '${GROUP_TO_DEL}'"
+	[[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
+	echo " ..."
+	${chroot} delgroup "${GROUP_TO_DEL}"
 
 # normal systems
 else
-	#start nscd to cache /etc/group
-	$(which nscd) -i group
 	# get the info
-	my_user="$(getent group ${GROUP_TO_DEL})"
+	my_user="$(${chroot} getent group ${GROUP_TO_DEL})"
 
 	if [ -z "${my_user}" ]
 	then
-		echo "     User '${GROUP_TO_DEL}' already deleted ..."
+		echo -n "     User '${GROUP_TO_DEL}' already deleted"
+		[[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
+		echo " ..."
 	else
-		echo "     Deleting user '${GROUP_TO_DEL}' ..."
-		groupdel "${GROUP_TO_DEL}"
+		echo -n "     Deleting user '${GROUP_TO_DEL}'"
+		[[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
+		echo " ..."
+		${chroot} groupdel "${GROUP_TO_DEL}"
 	fi
 fi