Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/museradd

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

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

    revision 1499 by niro, Wed Apr 27 09:45:07 2011 UTC revision 1500 by niro, Tue Aug 30 10:37:48 2011 UTC
    # Line 55  busybox_fix_group_opts() Line 55  busybox_fix_group_opts()
    55   echo "${FIXED_GROUP_OPTS}"   echo "${FIXED_GROUP_OPTS}"
    56  }  }
    57    
    58    if [[ ! -z ${MROOT} ]] && [[ ${MROOT} != / ]]
    59    then
    60     chroot="chroot ${MROOT} "
    61    else
    62     chroot=""
    63    fi
    64    
    65  while getopts "o:-" opt ; do  while getopts "o:-" opt ; do
    66   case "${opt}" in   case "${opt}" in
    67   o)   o)
    # Line 84  USER_TO_ADD="$1" Line 91  USER_TO_ADD="$1"
    91  # busybox support needed?  # busybox support needed?
    92  if need_busybox_support adduser  if need_busybox_support adduser
    93  then  then
    94   echo "     Adding user '${USER_TO_ADD}' ..."   echo -n "     Adding user '${USER_TO_ADD}'"
    95   adduser -D $(busybox_fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"   [[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
    96     echo " ..."
    97     ${chroot} adduser -D $(busybox_fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
    98   for grp in $(busybox_fix_group_opts ${USER_OPTS})   for grp in $(busybox_fix_group_opts ${USER_OPTS})
    99   do   do
    100   addgroup "${USER_TO_ADD}" "${grp}"   ${chroot} addgroup "${USER_TO_ADD}" "${grp}"
    101   done   done
    102    
    103  # normal systems  # normal systems
    104  else  else
      #start nscd to cache passwd  
      $(which nscd) -i passwd  
    105   # get the info   # get the info
    106   my_user="$(getent passwd ${USER_TO_ADD})"   my_user="$(${chroot} getent passwd ${USER_TO_ADD})"
    107    
    108   if [ -z "${my_user}" ]   if [ -z "${my_user}" ]
    109   then   then
    110   echo "     Adding user '${USER_TO_ADD}' ..."   echo -n "     Adding user '${USER_TO_ADD}'"
    111   useradd ${USER_OPTS} "${USER_TO_ADD}"   [[ ! -z ${chroot} ]] && echo -n " into MROOT='${MROOT}'"
    112     echo " ..."
    113     ${chroot} useradd ${USER_OPTS} "${USER_TO_ADD}"
    114   else   else
    115   echo "     Modifing user '${USER_TO_ADD}' ..."   echo -n "     Modifing user '${USER_TO_ADD}'"
    116   usermod ${USER_OPTS} "${USER_TO_ADD}"   [[ ! -z ${chroot} ]] && echo -n " in MROOT='${MROOT}'"
    117     echo " ..."
    118     ${chroot} usermod ${USER_OPTS} "${USER_TO_ADD}"
    119   fi   fi
    120  fi  fi
    Legend:
    Removed from v.1499  
    changed lines
      Added in v.1500