--- trunk/mage/usr/lib/mage/museradd	2011/04/27 09:45:07	1273
+++ trunk/mage/usr/lib/mage/museradd	2013/07/15 08:13:49	2142
@@ -31,6 +31,7 @@
 			-G) shift; shift; continue;; # will be parsed through fix_group_opts
 			-u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S"; FIXED_USER_OPTS+=" -u $1" ;;
 			-r) FIXED_USER_OPTS+=" -S" ;;
+			-M) FIXED_USER_OPTS+=" -H" ;;
 			*) FIXED_USER_OPTS+=" $1" ;;
 		esac
 		shift
@@ -55,6 +56,30 @@
 	echo "${FIXED_GROUP_OPTS}"
 }
 
+fix_usermod_opts()
+{
+	local i
+	local FIXED_USERMOD_OPTS
+
+	for i in $*
+	do
+		case $1 in
+			-M) continue ;; # usermod does not support the -M switch
+			*) FIXED_USERMOD_OPTS+=" $1" ;;
+		esac
+		shift
+	done
+
+	echo "${FIXED_USERMOD_OPTS}"
+}
+
+if [[ ! -z ${MROOT} ]] && [[ ${MROOT} != / ]]
+then
+	chroot="chroot ${MROOT} "
+else
+	chroot=""
+fi
+
 while getopts "o:-" opt ; do
 	case "${opt}" in
 		o)
@@ -84,26 +109,30 @@
 # busybox support needed?
 if need_busybox_support adduser
 then
-	echo "     Adding user '${USER_TO_ADD}' ..."
-	adduser -D $(busybox_fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
+	echo -n "     Adding user '${USER_TO_ADD}'"
+	[[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
+	echo " ..."
+	${chroot} adduser -S -D $(busybox_fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
 	for grp in $(busybox_fix_group_opts ${USER_OPTS})
 	do
-		addgroup "${USER_TO_ADD}" "${grp}"
+		${chroot} addgroup "${USER_TO_ADD}" "${grp}"
 	done
 
 # normal systems
 else
-	#start nscd to cache passwd
-	$(which nscd) -i passwd
 	# get the info
-	my_user="$(getent passwd ${USER_TO_ADD})"
+	my_user="$(${chroot} getent passwd ${USER_TO_ADD})"
 
 	if [ -z "${my_user}" ]
 	then
-		echo "     Adding user '${USER_TO_ADD}' ..."
-		useradd ${USER_OPTS} "${USER_TO_ADD}"
+		echo -n "     Adding user '${USER_TO_ADD}'"
+		[[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
+		echo " ..."
+		${chroot} useradd -r ${USER_OPTS} "${USER_TO_ADD}"
 	else
-		echo "     Modifing user '${USER_TO_ADD}' ..."
-		usermod ${USER_OPTS} "${USER_TO_ADD}"
+		echo -n "     Modifing user '${USER_TO_ADD}'"
+		[[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
+		echo " ..."
+		${chroot} usermod $(fix_usermod_opts ${USER_OPTS}) "${USER_TO_ADD}"
 	fi
 fi