/[gentoo-x86]/eclass/user.eclass
Gentoo

Diff of /eclass/user.eclass

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

Revision 1.12 Revision 1.14
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.12 2011/11/26 06:45:38 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.14 2011/11/26 07:20:31 vapier Exp $
4 4
5# @ECLASS: user.eclass 5# @ECLASS: user.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org (Linux) 7# base-system@gentoo.org (Linux)
8# Joe Jezak <josejx@gmail.com> (OS X) 8# Joe Jezak <josejx@gmail.com> (OS X)
117 return 0 117 return 0
118 fi 118 fi
119 einfo "Adding user '${euser}' to your system ..." 119 einfo "Adding user '${euser}' to your system ..."
120 120
121 # options to pass to useradd 121 # options to pass to useradd
122 local opts= 122 local opts=()
123 123
124 # handle uid 124 # handle uid
125 local euid=$1; shift 125 local euid=$1; shift
126 if [[ -n ${euid} && ${euid} != -1 ]] ; then 126 if [[ -n ${euid} && ${euid} != -1 ]] ; then
127 if [[ ${euid} -gt 0 ]] ; then 127 if [[ ${euid} -gt 0 ]] ; then
138 if [[ ${euid} == "next" ]] ; then 138 if [[ ${euid} == "next" ]] ; then
139 for ((euid = 101; euid <= 999; euid++)); do 139 for ((euid = 101; euid <= 999; euid++)); do
140 [[ -z $(egetent passwd ${euid}) ]] && break 140 [[ -z $(egetent passwd ${euid}) ]] && break
141 done 141 done
142 fi 142 fi
143 opts+=" -u ${euid}" 143 opts+=( -u ${euid} )
144 einfo " - Userid: ${euid}" 144 einfo " - Userid: ${euid}"
145 145
146 # handle shell 146 # handle shell
147 local eshell=$1; shift 147 local eshell=$1; shift
148 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 148 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
153 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then 153 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
154 eerror "Do not specify ${eshell} yourself, use -1" 154 eerror "Do not specify ${eshell} yourself, use -1"
155 die "Pass '-1' as the shell parameter" 155 die "Pass '-1' as the shell parameter"
156 fi 156 fi
157 else 157 else
158 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 158 for eshell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
159 [[ -x ${ROOT}${shell} ]] && break 159 [[ -x ${ROOT}${eshell} ]] && break
160 done 160 done
161 161
162 if [[ ${shell} == "/dev/null" ]] ; then 162 if [[ ${eshell} == "/dev/null" ]] ; then
163 eerror "Unable to identify the shell to use, proceeding with userland default." 163 eerror "Unable to identify the shell to use, proceeding with userland default."
164 case ${USERLAND} in 164 case ${USERLAND} in
165 GNU) shell="/bin/false" ;; 165 GNU) eshell="/bin/false" ;;
166 BSD) shell="/sbin/nologin" ;; 166 BSD) eshell="/sbin/nologin" ;;
167 Darwin) shell="/usr/sbin/nologin" ;; 167 Darwin) eshell="/usr/sbin/nologin" ;;
168 *) die "Unable to identify the default shell for userland ${USERLAND}" 168 *) die "Unable to identify the default shell for userland ${USERLAND}"
169 esac 169 esac
170 fi 170 fi
171
172 eshell=${shell}
173 fi 171 fi
174 einfo " - Shell: ${eshell}" 172 einfo " - Shell: ${eshell}"
175 opts+=" -s ${eshell}" 173 opts+=( -s "${eshell}" )
176 174
177 # handle homedir 175 # handle homedir
178 local ehome=$1; shift 176 local ehome=$1; shift
179 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then 177 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
180 ehome="/dev/null" 178 ehome="/dev/null"
181 fi 179 fi
182 einfo " - Home: ${ehome}" 180 einfo " - Home: ${ehome}"
183 opts+=" -d ${ehome}" 181 opts+=( -d "${ehome}" )
184 182
185 # handle groups 183 # handle groups
186 local egroups=$1; shift 184 local egroups=$1; shift
187 if [[ ! -z ${egroups} ]] ; then 185 if [[ ! -z ${egroups} ]] ; then
188 local oldifs=${IFS} 186 local oldifs=${IFS}
202 fi 200 fi
203 export IFS="," 201 export IFS=","
204 done 202 done
205 export IFS=${oldifs} 203 export IFS=${oldifs}
206 204
207 opts+=" -g ${defgroup}" 205 opts+=( -g "${defgroup}" )
208 if [[ ! -z ${exgroups} ]] ; then 206 if [[ ! -z ${exgroups} ]] ; then
209 opts+=" -G ${exgroups:1}" 207 opts+=( -G "${exgroups:1}" )
210 fi 208 fi
211 else 209 else
212 egroups="(none)" 210 egroups="(none)"
213 fi 211 fi
214 einfo " - Groups: ${egroups}" 212 einfo " - Groups: ${egroups}"
215 213
216 # handle extra args 214 # handle extra args
217 if [[ $# -gt 0 ]] ; then 215 if [[ $# -gt 0 ]] ; then
218 die "extra arguments no longer supported; please file a bug" 216 die "extra arguments no longer supported; please file a bug"
219 else 217 else
220 set -- -c "added by portage for ${PN}" 218 local comment="added by portage for ${PN}"
221 einfo " - Extra: $@" 219 opts+=( -c "${comment}" )
220 einfo " - GECOS: ${comment}"
222 fi 221 fi
223 222
224 # add the user 223 # add the user
225 case ${CHOST} in 224 case ${CHOST} in
226 *-darwin*) 225 *-darwin*)
227 ### Make the user 226 ### Make the user
228 dscl . create /users/${euser} uid ${euid} 227 dscl . create "/users/${euser}" uid ${euid}
229 dscl . create /users/${euser} shell ${eshell} 228 dscl . create "/users/${euser}" shell "${eshell}"
230 dscl . create /users/${euser} home ${ehome} 229 dscl . create "/users/${euser}" home "${ehome}"
231 dscl . create /users/${euser} realname "added by portage for ${PN}" 230 dscl . create "/users/${euser}" realname "added by portage for ${PN}"
232 ### Add the user to the groups specified 231 ### Add the user to the groups specified
233 local oldifs=${IFS} 232 local g oldifs=${IFS}
234 export IFS="," 233 export IFS=","
235 for g in ${egroups} ; do 234 for g in ${egroups} ; do
236 dscl . merge /groups/${g} users ${euser} 235 dscl . merge "/groups/${g}" users "${euser}"
237 done 236 done
238 export IFS=${oldifs} 237 export IFS=${oldifs}
239 ;; 238 ;;
240 239
241 *-freebsd*|*-dragonfly*) 240 *-freebsd*|*-dragonfly*)
242 pw useradd ${euser} ${opts} "$@" || die 241 pw useradd "${euser}" "${opts[@]}" || die
243 ;; 242 ;;
244 243
245 *-netbsd*) 244 *-netbsd*)
246 useradd ${opts} ${euser} "$@" || die 245 useradd "${opts[@]}" "${euser}" || die
247 ;; 246 ;;
248 247
249 *-openbsd*) 248 *-openbsd*)
250 # all ops the same, except the -g vs -g/-G ... 249 # all ops the same, except the -g vs -g/-G ...
251 useradd -u ${euid} -s ${eshell} \ 250 useradd -u ${euid} -s "${eshell}" \
252 -d ${ehome} -g ${egroups} "$@" ${euser} || die 251 -d "${ehome}" -g "${egroups}" "${euser}" || die
253 ;; 252 ;;
254 253
255 *) 254 *)
256 useradd -r ${opts} "$@" ${euser} || die 255 useradd -r "${opts[@]}" "${euser}" || die
257 ;; 256 ;;
258 esac 257 esac
259 258
260 if [[ ! -e ${ROOT}/${ehome} ]] ; then 259 if [[ ! -e ${ROOT}/${ehome} ]] ; then
261 einfo " - Creating ${ehome} in ${ROOT}" 260 einfo " - Creating ${ehome} in ${ROOT}"
262 mkdir -p "${ROOT}/${ehome}" 261 mkdir -p "${ROOT}/${ehome}"
263 chown ${euser} "${ROOT}/${ehome}" 262 chown "${euser}" "${ROOT}/${ehome}"
264 chmod 755 "${ROOT}/${ehome}" 263 chmod 755 "${ROOT}/${ehome}"
265 fi 264 fi
266} 265}
267 266
268# @FUNCTION: enewgroup 267# @FUNCTION: enewgroup
274# allocate the next available one. 273# allocate the next available one.
275enewgroup() { 274enewgroup() {
276 _assert_pkg_ebuild_phase enewgroup 275 _assert_pkg_ebuild_phase enewgroup
277 276
278 # get the group 277 # get the group
279 local egroup="$1"; shift 278 local egroup=$1; shift
280 if [ -z "${egroup}" ] 279 if [[ -z ${egroup} ]] ; then
281 then
282 eerror "No group specified !" 280 eerror "No group specified !"
283 die "Cannot call enewgroup without a group" 281 die "Cannot call enewgroup without a group"
284 fi 282 fi
285 283
286 # see if group already exists 284 # see if group already exists
287 if [[ -n $(egetent group "${egroup}") ]]; then 285 if [[ -n $(egetent group "${egroup}") ]] ; then
288 return 0 286 return 0
289 fi 287 fi
290 einfo "Adding group '${egroup}' to your system ..." 288 einfo "Adding group '${egroup}' to your system ..."
291 289
292 # options to pass to useradd
293 local opts=
294
295 # handle gid 290 # handle gid
296 local egid="$1"; shift 291 local egid=$1; shift
297 if [ ! -z "${egid}" ] 292 if [[ ! -z ${egid} ]] ; then
298 then
299 if [ "${egid}" -gt 0 ] 293 if [[ ${egid} -gt 0 ]] ; then
300 then
301 if [ -z "`egetent group ${egid}`" ] 294 if [[ -n $(egetent group ${egid}) ]] ; then
302 then
303 if [[ "${CHOST}" == *-darwin* ]]; then
304 opts+=" ${egid}"
305 else
306 opts+=" -g ${egid}"
307 fi
308 else
309 egid="next available; requested gid taken" 295 egid="next available; requested gid taken"
310 fi 296 fi
311 else 297 else
312 eerror "Groupid given but is not greater than 0 !" 298 eerror "Groupid given but is not greater than 0 !"
313 die "${egid} is not a valid GID" 299 die "${egid} is not a valid GID"
316 egid="next available" 302 egid="next available"
317 fi 303 fi
318 einfo " - Groupid: ${egid}" 304 einfo " - Groupid: ${egid}"
319 305
320 # handle extra 306 # handle extra
321 if [ $# -gt 0 ] ; then 307 if [[ $# -gt 0 ]] ; then
322 die "extra arguments no longer supported; please file a bug" 308 die "extra arguments no longer supported; please file a bug"
323 fi 309 fi
324 310
325 # add the group 311 # Some targets need to find the next available GID manually
326 case ${CHOST} in 312 _enewgroup_next_gid() {
327 *-darwin*) 313 if [[ ${egid} == *[!0-9]* ]] ; then
328 # If we need the next available
329 case ${egid} in
330 *[!0-9]*) # Non numeric 314 # Non numeric
331 for ((egid = 101; egid <= 999; egid++)); do 315 for ((egid = 101; egid <= 999; egid++)) ; do
332 [[ -z $(egetent group ${egid}) ]] && break 316 [[ -z $(egetent group ${egid}) ]] && break
333 done 317 done
334 esac 318 fi
319 }
320
321 # add the group
322 case ${CHOST} in
323 *-darwin*)
324 _enewgroup_next_gid
335 dscl . create /groups/${egroup} gid ${egid} 325 dscl . create "/groups/${egroup}" gid ${egid}
336 dscl . create /groups/${egroup} passwd '*' 326 dscl . create "/groups/${egroup}" passwd '*'
337 ;; 327 ;;
338 328
339 *-freebsd*|*-dragonfly*) 329 *-freebsd*|*-dragonfly*)
340 case ${egid} in 330 _enewgroup_next_gid
341 *[!0-9]*) # Non numeric
342 for ((egid = 101; egid <= 999; egid++)); do
343 [[ -z $(egetent group ${egid}) ]] && break
344 done
345 esac
346 pw groupadd ${egroup} -g ${egid} || die 331 pw groupadd "${egroup}" -g ${egid} || die
347 ;; 332 ;;
348 333
349 *-netbsd*) 334 *-netbsd*)
350 case ${egid} in 335 _enewgroup_next_gid
351 *[!0-9]*) # Non numeric
352 for ((egid = 101; egid <= 999; egid++)); do
353 [[ -z $(egetent group ${egid}) ]] && break
354 done
355 esac
356 groupadd -g ${egid} ${egroup} || die 336 groupadd -g ${egid} "${egroup}" || die
357 ;; 337 ;;
358 338
359 *) 339 *)
340 local opts
341 if [[ ${egid} == *[!0-9]* ]] ; then
342 # Non numeric; let groupadd figure out a GID for us
343 opts=""
344 else
345 opts="-g ${egid}"
346 fi
360 # We specify -r so that we get a GID in the system range from login.defs 347 # We specify -r so that we get a GID in the system range from login.defs
361 groupadd -r ${opts} ${egroup} || die 348 groupadd -r ${opts} "${egroup}" || die
362 ;; 349 ;;
363 esac 350 esac
364} 351}
365 352
366# @FUNCTION: egethome 353# @FUNCTION: egethome
379 *) # Linux, NetBSD, OpenBSD, etc... 366 *) # Linux, NetBSD, OpenBSD, etc...
380 pos=6 367 pos=6
381 ;; 368 ;;
382 esac 369 esac
383 370
384 egetent passwd $1 | cut -d: -f${pos} 371 egetent passwd "$1" | cut -d: -f${pos}
385} 372}
386 373
387# @FUNCTION: egetshell 374# @FUNCTION: egetshell
388# @USAGE: <user> 375# @USAGE: <user>
389# @DESCRIPTION: 376# @DESCRIPTION:

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.14

  ViewVC Help
Powered by ViewVC 1.1.20