--- trunk/mage/usr/lib/mage/museradd	2011/08/30 10:37:48	1500
+++ trunk/mage/usr/lib/mage/museradd	2013/10/25 06:48:57	2268
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/museradd,v 1.4 2005-06-01 15:48:43 niro Exp $
+# $Id$
 
 # include all needed files
 [ -f /etc/mage.rc.global ] && source /etc/mage.rc.global
@@ -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,23 @@
 	echo "${FIXED_GROUP_OPTS}"
 }
 
+fix_usermod_opts()
+{
+	local i
+	local FIXED_USERMOD_OPTS
+
+	for i in $*
+	do
+		case $1 in
+			-M) : ;; # 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} "
@@ -94,7 +112,7 @@
 	echo -n "     Adding user '${USER_TO_ADD}'"
 	[[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
 	echo " ..."
-	${chroot} adduser -D $(busybox_fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
+	${chroot} adduser -S -D $(busybox_fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
 	for grp in $(busybox_fix_group_opts ${USER_OPTS})
 	do
 		${chroot} addgroup "${USER_TO_ADD}" "${grp}"
@@ -110,11 +128,11 @@
 		echo -n "     Adding user '${USER_TO_ADD}'"
 		[[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
 		echo " ..."
-		${chroot} useradd ${USER_OPTS} "${USER_TO_ADD}"
+		${chroot} useradd -r ${USER_OPTS} "${USER_TO_ADD}"
 	else
 		echo -n "     Modifing user '${USER_TO_ADD}'"
 		[[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
 		echo " ..."
-		${chroot} usermod ${USER_OPTS} "${USER_TO_ADD}"
+		${chroot} usermod $(fix_usermod_opts ${USER_OPTS}) "${USER_TO_ADD}"
 	fi
 fi