Changeset 2815 for lmd-client/trunk

Timestamp:

Nov 10, 2016, 2:13:35 PM (4 years ago)

Author:

hectorgh

Message:

adding samba mount support instead of sshfs

File:

• lmd-client/trunk/fuentes/install/usr/share/ldm/rc.d.diversions/X01-localapps.lliurex (modified) (3 diffs)

lmd-client/trunk/fuentes/install/usr/share/ldm/rc.d.diversions/X01-localapps.lliurex

@@ -167 +167 @@
         USER_GID="$gid"
         mkdir -p ${LDM_HOME}
-        rsync -ax /etc/skel/ "${LDM_HOME}/"
-        chown -R  "$USER_UID":"$USER_GID" ${LDM_HOME}
+        
+        # LLIUREX HACK
+        rsync -ax /etc/skel/ ${LDM_HOME}
+        chown -R "$USER_UID":"$USER_GID" ${LDM_HOME}
+
         if [ -n "${XAUTHORITY_DIR}" ]; then
             chown "$USER_UID":"$USER_GID" ${XAUTHORITY_DIR}
@@ -195 +198 @@
     else
         unset SSHFS_HOME
-        
-        # BEGIN LLX HACK
-        #export SSHFS_HOME=true
-        #sshfs -o ${follow_home_symlinks}allow_other,ControlPath=${LDM_SOCKET} ${LDM_SERVER}:${LDM_HOME} ${LDM_HOME}
-        
+
+
       # Create Vars
         GRP_USER="$(id -ng ${LDM_USERNAME})"
         NET_HOME="/net/server-sync/home/${GRP_USER}/${LDM_USERNAME}"
 
-        # Create UserFiles Structure
-        #mkdir ${LDM_HOME}/UserFiles
-        #chown -R ${LDM_USERNAME}:${GRP_USER} ${LDM_HOME}/UserFiles
-
-        # Mount SSHFS net/server-sync/home...
-        #sshfs -o ${follow_home_symlinks}allow_other,ControlPath=${LDM_SOCKET} ${LDM_USERNAME}@${LDM_SERVER}:${NET_HOME}/UserFiles ${LDM_HOME}/UserFiles
-        #echo "anem a muntar /net" > /tmp/homelinker2
-        
-        
-        if [ ! -d "/net" ] ; then
-                mkdir /net
-        fi
-        
-        sshfs -o nonempty,${follow_home_symlinks}allow_other,ControlPath=${LDM_SOCKET} ${LDM_USERNAME}@${LDM_SERVER}:/net /net
+        ## OLD SSHFS MOUNT ## #######
+
+        #if [ ! -d "/net" ] ; then
+        #       mkdir /net
+        #fi
+        
+        #sshfs -o nonempty,${follow_home_symlinks}allow_other,ControlPath=${LDM_SOCKET} ${LDM_USERNAME}@${LDM_SERVER}:/net /net
         
                 
-        #for folder in Documents Groups Music Videos Pictures Share; do
-        #    if [ -h "${LDM_HOME}/${folder}" ]; then
-        #        echo "LLX LDM: ${LDM_HOME}/${folder} already exists" >> /var/log/ldm.log
-        #        echo "LLX LDM: ${LDM_HOME}/${folder} already exists" >> /tmp/ldm.log
-        #    else
-        #        ln -s ${LDM_HOME}/UserFiles/${folder}/ ${LDM_HOME}/${folder}
-        #        chown -R ${LDM_USERNAME}:${GRP_USER} ${LDM_HOME}/${folder}
-        #    fi  
-        #done
-
-        # END LLX HACK
+        ## ##################### ####
 
     fi
@@ -275 +258 @@
     n4d-modules enable-plugin /etc/n4d/conf.d/TeacherShare || true
 
+    if boolean_is_true "$LTSP_FATCLIENT"; then
+
+            mkdir -p /run/$LDM_USERNAME/home
+            mkdir -p /run/$LDM_USERNAME/share
+            mkdir -p /run/$LDM_USERNAME/groups_share
+            mkdir -p /run/$LDM_USERNAME/teachers_share
+
+            mount //server/home /run/$LDM_USERNAME/home -o username=$LDM_USERNAME,password=$LDM_PASSWORD
+            mount //server/share /run/$LDM_USERNAME/share -o username=$LDM_USERNAME,password=$LDM_PASSWORD
+            mount //server/groups_share /run/$LDM_USERNAME/groups_share -o username=$LDM_USERNAME,password=$LDM_PASSWORD
+            mount //server/teachers_share /run/$LDM_USERNAME/teachers_share -o username=$LDM_USERNAME,password=$LDM_PASSWORD
+
+    fi
+
+    unset LDM_PASSWORD 
+
+
 fi