blob: f8e39bf9946e184700b56a284363bb9ab53ba8d9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- src/diradm.user.sh.in 2008-08-21 14:15:55.600127921 -0400
+++ src.new/diradm.user.sh.in 2008-08-21 14:18:44.096787891 -0400
@@ -312,12 +312,14 @@
if [ "${CREATEHOMEDIR}" == "yes" ]; then
# Create Homedir
# make sure the functions are defined
- source ${libexecdir}/diradm.automount.sh
- targetdir="$(amhash "${AUTOMOUNT_USERDIRBASE}" "${LOGIN}")"
- if [ "${USER_AUTOMOUNTHOME}" == "yes" ]; then
+ if [ "${ENABLE_AUTOMOUNT}" == "yes" -a "${USER_AUTOMOUNTHOME}" == "yes" ]; then
# add automount entry first
# create hashed dir path
+ source ${libexecdir}/diradm.automount.sh
+ targetdir="$(amhash "${AUTOMOUNT_USERDIRBASE}" "${LOGIN}")"
amadd -d "${AUTOMOUNT_USERDESC}" -o "${AUTOMOUNT_OPTIONS_USERS}" -- "${AUTOMOUNT_USERMAP}" "${LOGIN}" "${targetdir}"
+ else
+ targetdir="${HOMEDIRECTORY}"
fi
# strip NFS host to make local path
targetdir_no_nfs="${targetdir/*:}"
|
GitWeb
