26c26
< # $FreeBSD: head/usr.sbin/pc-sysinstall/backend/functions-users.sh 209552 2010-06-27 16:46:11Z imp $
---
> # $FreeBSD: head/usr.sbin/pc-sysinstall/backend/functions-users.sh 211730 2010-08-24 06:11:46Z imp $
75,80c75,80
< echo $line | grep "^userName=" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< get_value_from_string "${line}"
< USERNAME="$VAL"
< fi
---
> echo $line | grep "^userName=" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> get_value_from_string "${line}"
> USERNAME="$VAL"
> fi
82,87c82,87
< echo $line | grep "^userComment=" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< get_value_from_string "${line}"
< USERCOMMENT="$VAL"
< fi
---
> echo $line | grep "^userComment=" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> get_value_from_string "${line}"
> USERCOMMENT="$VAL"
> fi
89,94c89,94
< echo $line | grep "^userPass=" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< get_value_from_string "${line}"
< USERPASS="$VAL"
< fi
---
> echo $line | grep "^userPass=" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> get_value_from_string "${line}"
> USERPASS="$VAL"
> fi
96,102c96,102
< echo $line | grep "^userShell=" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< get_value_from_string "${line}"
< strip_white_space "$VAL"
< USERSHELL="$VAL"
< fi
---
> echo $line | grep "^userShell=" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> get_value_from_string "${line}"
> strip_white_space "$VAL"
> USERSHELL="$VAL"
> fi
104,109c104,109
< echo $line | grep "^userHome=" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< get_value_from_string "${line}"
< USERHOME="$VAL"
< fi
---
> echo $line | grep "^userHome=" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> get_value_from_string "${line}"
> USERHOME="$VAL"
> fi
111,116c111,116
< echo $line | grep "^userGroups=" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< get_value_from_string "${line}"
< USERGROUPS="$VAL"
< fi
---
> echo $line | grep "^userGroups=" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> get_value_from_string "${line}"
> USERGROUPS="$VAL"
> fi
119,124c119,124
< echo $line | grep "^commitUser" >/dev/null 2>/dev/null
< if [ "$?" = "0" ]
< then
< # Found our flag to commit this user, lets check and do it
< if [ ! -z "${USERNAME}" ]
< then
---
> echo $line | grep "^commitUser" >/dev/null 2>/dev/null
> if [ "$?" = "0" ]
> then
> # Found our flag to commit this user, lets check and do it
> if [ ! -z "${USERNAME}" ]
> then
126,127c126,127
< # Now add this user to the system, by building our args list
< ARGS="-n ${USERNAME}"
---
> # Now add this user to the system, by building our args list
> ARGS="-n ${USERNAME}"
129,132c129,132
< if [ ! -z "${USERCOMMENT}" ]
< then
< ARGS="${ARGS} -c \"${USERCOMMENT}\""
< fi
---
> if [ ! -z "${USERCOMMENT}" ]
> then
> ARGS="${ARGS} -c \"${USERCOMMENT}\""
> fi
134,141c134,141
< if [ ! -z "${USERPASS}" ]
< then
< ARGS="${ARGS} -h 0"
< echo "${USERPASS}" >${FSMNT}/.tmpPass
< else
< ARGS="${ARGS} -h -"
< rm ${FSMNT}/.tmpPass 2>/dev/null 2>/dev/null
< fi
---
> if [ ! -z "${USERPASS}" ]
> then
> ARGS="${ARGS} -h 0"
> echo "${USERPASS}" >${FSMNT}/.tmpPass
> else
> ARGS="${ARGS} -h -"
> rm ${FSMNT}/.tmpPass 2>/dev/null 2>/dev/null
> fi
143,148c143,148
< if [ ! -z "${USERSHELL}" ]
< then
< ARGS="${ARGS} -s \"${USERSHELL}\""
< else
< ARGS="${ARGS} -s \"/nonexistant\""
< fi
---
> if [ ! -z "${USERSHELL}" ]
> then
> ARGS="${ARGS} -s \"${USERSHELL}\""
> else
> ARGS="${ARGS} -s \"/nonexistant\""
> fi
150,153c150,153
< if [ ! -z "${USERHOME}" ]
< then
< ARGS="${ARGS} -m -d \"${USERHOME}\""
< fi
---
> if [ ! -z "${USERHOME}" ]
> then
> ARGS="${ARGS} -m -d \"${USERHOME}\""
> fi
155,158c155,158
< if [ ! -z "${USERGROUPS}" ]
< then
< ARGS="${ARGS} -G \"${USERGROUPS}\""
< fi
---
> if [ ! -z "${USERGROUPS}" ]
> then
> ARGS="${ARGS} -G \"${USERGROUPS}\""
> fi
160c160
< add_user "${ARGS}"
---
> add_user "${ARGS}"
162,167c162,167
< # Unset our vars before looking for any more users
< unset USERNAME USERCOMMENT USERPASS USERSHELL USERHOME USERGROUPS
< else
< exit_err "ERROR: commitUser was called without any userName= entry!!!"
< fi
< fi
---
> # Unset our vars before looking for any more users
> unset USERNAME USERCOMMENT USERPASS USERSHELL USERHOME USERGROUPS
> else
> exit_err "ERROR: commitUser was called without any userName= entry!!!"
> fi
> fi