Magellan Linux

Diff of /trunk/mage/usr/lib/mage/museradd

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1500 by niro, Tue Aug 30 10:37:48 2011 UTC revision 2268 by niro, Fri Oct 25 06:48:57 2013 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/museradd,v 1.4 2005-06-01 15:48:43 niro Exp $  # $Id$
3    
4  # include all needed files  # include all needed files
5  [ -f /etc/mage.rc.global ] && source /etc/mage.rc.global  [ -f /etc/mage.rc.global ] && source /etc/mage.rc.global
# Line 31  busybox_fix_user_opts() Line 31  busybox_fix_user_opts()
31   -G) shift; shift; continue;; # will be parsed through fix_group_opts   -G) shift; shift; continue;; # will be parsed through fix_group_opts
32   -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S"; FIXED_USER_OPTS+=" -u $1" ;;   -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S"; FIXED_USER_OPTS+=" -u $1" ;;
33   -r) FIXED_USER_OPTS+=" -S" ;;   -r) FIXED_USER_OPTS+=" -S" ;;
34     -M) FIXED_USER_OPTS+=" -H" ;;
35   *) FIXED_USER_OPTS+=" $1" ;;   *) FIXED_USER_OPTS+=" $1" ;;
36   esac   esac
37   shift   shift
# Line 55  busybox_fix_group_opts() Line 56  busybox_fix_group_opts()
56   echo "${FIXED_GROUP_OPTS}"   echo "${FIXED_GROUP_OPTS}"
57  }  }
58    
59    fix_usermod_opts()
60    {
61     local i
62     local FIXED_USERMOD_OPTS
63    
64     for i in $*
65     do
66     case $1 in
67     -M) : ;; # usermod does not support the -M switch
68     *) FIXED_USERMOD_OPTS+=" $1" ;;
69     esac
70     shift
71     done
72    
73     echo "${FIXED_USERMOD_OPTS}"
74    }
75    
76  if [[ ! -z ${MROOT} ]] && [[ ${MROOT} != / ]]  if [[ ! -z ${MROOT} ]] && [[ ${MROOT} != / ]]
77  then  then
78   chroot="chroot ${MROOT} "   chroot="chroot ${MROOT} "
# Line 94  then Line 112  then
112   echo -n "     Adding user '${USER_TO_ADD}'"   echo -n "     Adding user '${USER_TO_ADD}'"
113   [[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"   [[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
114   echo " ..."   echo " ..."
115   ${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}"
116   for grp in $(busybox_fix_group_opts ${USER_OPTS})   for grp in $(busybox_fix_group_opts ${USER_OPTS})
117   do   do
118   ${chroot} addgroup "${USER_TO_ADD}" "${grp}"   ${chroot} addgroup "${USER_TO_ADD}" "${grp}"
# Line 110  else Line 128  else
128   echo -n "     Adding user '${USER_TO_ADD}'"   echo -n "     Adding user '${USER_TO_ADD}'"
129   [[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"   [[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
130   echo " ..."   echo " ..."
131   ${chroot} useradd ${USER_OPTS} "${USER_TO_ADD}"   ${chroot} useradd -r ${USER_OPTS} "${USER_TO_ADD}"
132   else   else
133   echo -n "     Modifing user '${USER_TO_ADD}'"   echo -n "     Modifing user '${USER_TO_ADD}'"
134   [[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"   [[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
135   echo " ..."   echo " ..."
136   ${chroot} usermod ${USER_OPTS} "${USER_TO_ADD}"   ${chroot} usermod $(fix_usermod_opts ${USER_OPTS}) "${USER_TO_ADD}"
137   fi   fi
138  fi  fi

Legend:
Removed from v.1500  
changed lines
  Added in v.2268