Changeset 2799
- Timestamp:
- Nov 9, 2016, 1:05:48 PM (4 years ago)
- Location:
- home-linker/trunk/fuentes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
home-linker/trunk/fuentes/debian/changelog
r2786 r2799 1 home-linker (0.60) xenial; urgency=high 2 3 * Fix bug in umount home-linker 4 5 -- Daniel Duran Vecino <daduve@gmail.com> Wed, 09 Nov 2016 13:04:48 +0100 6 1 7 home-linker (0.59) xenial; urgency=high 2 8 -
home-linker/trunk/fuentes/home-linker.install/usr/sbin/home-linker
r2785 r2799 7 7 LOG="/var/log/home_linker.log" 8 8 echo "" > "$LOG" 9 echo "******************************" >> "$LOG" 10 echo "WELOCOME TO HOME-LINKER LOG" >> "$LOG" 11 echo "" >> "$LOG" 12 date >> "$LOG" 13 echo "******************************" >> "$LOG" 14 echo "" >> "$LOG" 9 15 echo "Username -> $1" >> "$LOG" 10 16 … … 90 96 91 97 # Umount directories mounted previously 92 LIST_BIND_MOUNTED="$(mount | grep /net | cut -d ' ' -f3 | tr '\n' ' ')" 98 NEEDLE="${DESKTOP_LOCALE}|${DOCUMENTS_LOCALE}|${SHARE_LOCALE}|${SHARETEACHERS_LOCALE}|${GROUPSSHARE_LOCALE}|${DATA_ALUM}" 99 LIST_BIND_MOUNTED="$(mount | grep -E '/net|/server' | grep '/'$USER'/' | grep -E $NEEDLE | cut -d ' ' -f3 | tr '\n' ' ')" 93 100 echo "" >> "$LOG" 94 101 echo " LIST MOUNTED POINTS AT LOGIN" >> "$LOG" … … 215 222 if [ -d "/net/server-sync/home/$GRP_USER/$HL_USER/" ]; then 216 223 # other machines in aula 217 echo "OTHER MACHINES IN AULA" >> "$LOG" 218 [ "${DESKTOP_LOCALE}" = "" ] || mount --bind /net/server-sync/home/$GRP_USER/$HL_USER/Desktop $HL_HOME/${DESKTOP_LOCALE} || true 219 [ "${DOCUMENTS_LOCALE}" = "" ] || mount --bind /net/server-sync/home/$GRP_USER/$HL_USER/Documents $HL_HOME/${DOCUMENTS_LOCALE} || true 220 [ "${SHARE_LOCALE}" = "" ] || mount --bind /net/server-sync/share $HL_HOME/${SHARE_LOCALE} || true 224 echo " THIN CLIENT TO MOUNT" >> "$LOG" 225 echo "----------------------" >> "$LOG" 226 echo "MOUNTING ${DESKTOP_LOCALE}" >> "$LOG" 227 [ "${DESKTOP_LOCALE}" = "" ] || mount --bind /net/server-sync/home/$GRP_USER/$HL_USER/Desktop $HL_HOME/${DESKTOP_LOCALE} 1>> $LOG 2>>$LOG || true 228 echo "MOUNTING ${DOCUMENTS_LOCALE}" >> "$LOG" 229 [ "${DOCUMENTS_LOCALE}" = "" ] || mount --bind /net/server-sync/home/$GRP_USER/$HL_USER/Documents $HL_HOME/${DOCUMENTS_LOCALE} 1>> $LOG 2>>$LOG || true 230 echo "MOUNTING ${SHARE_LOCALE}" >> "$LOG" 231 [ "${SHARE_LOCALE}" = "" ] || mount --bind /net/server-sync/share $HL_HOME/${SHARE_LOCALE} 1>> $LOG 2>>$LOG || true 232 if [ "$GRP_USER" = "teachers" ]; then 233 # DELETE OLD DIRECTORIES FOR OTHER LANGUAGES 234 for i in es_ES.UTF-8 ca_ES.UTF-8@Valencia ca_ES.UTF-8@valencia; do 235 SHARETEACHERS_LOCALE_ERASE="$(/usr/bin/xdg_translator "$i" "Teachers_Share")" 236 if [ -d "$HL_HOME/$SHARETEACHERS_LOCALE_ERASE" ]; then 237 echo "Borrando $HL_HOME/$SHARETEACHERS_LOCALE_ERASE" >> "$LOG" 238 rm -d "$HL_HOME/$SHARETEACHERS_LOCALE_ERASE" >> "$LOG" 239 fi 240 done 241 for i in es_ES.UTF-8 ca_ES.UTF-8@Valencia ca_ES.UTF-8@valencia; do 242 DATA_ALUM_ERASE="$(/usr/bin/xdg_translator "$i" "Data_Alum")" 243 if [ -d "$HL_HOME/$DATA_ALUM_ERASE" ]; then 244 echo "Borrando $HL_HOME/$DATA_ALUM_ERASE" >> "$LOG" 245 rm -d "$HL_HOME/$DATA_ALUM_ERASE" >> "$LOG" 246 fi 247 done 248 249 250 echo "MOUNTING ${SHARETEACHERS_LOCALE}" >> "$LOG" 251 [ -d ${HL_HOME}/${SHARETEACHERS_LOCALE} ] || mkdir ${HL_HOME}/${SHARETEACHERS_LOCALE} 252 [ "${SHARETEACHERS_LOCALE}" = "" ] || mount --bind /net/server-sync/teachers_share $HL_HOME/${SHARETEACHERS_LOCALE} 1>> $LOG 2>>$LOG || true 253 254 echo "MOUNTING ${DATA_ALUM}" >> "$LOG" 255 [ -d $HL_HOME/$DATA_ALUM ] || mkdir $HL_HOME/$DATA_ALUM 256 [ "${DATA_ALUM}" = "" ] || mount --bind /net/server-sync/home/students/ $HL_HOME/$DATA_ALUM 1>> $LOG 2>>$LOG || true 257 258 fi 259 echo "MOUNTING ${GROUPSSHARE_LOCALE}" >> "$LOG" 260 [ "${GROUPSSHARE_LOCALE}" = "" ] || mount --bind /net/server-sync/groups_share $HL_HOME/${GROUPSSHARE_LOCALE} 1>> $LOG 2>>$LOG || true 261 262 elif [ -d "/var/run/$HL_USER/home" ]; then 263 #Fat clients 264 echo " FATCLIENTS TO MOUNT" >> "$LOG" 265 echo "----------------------" >> "$LOG" 266 echo "MOUNTING ${DESKTOP_LOCALE}" >> "$LOG" 267 [ "${DESKTOP_LOCALE}" = "" ] || mount --bind /run/$HL_USER/home/$GRP_USER/$HL_USER/Desktop $HL_HOME/${DESKTOP_LOCALE}1>> $LOG 2>>$LOG || true 268 echo "MOUNTING ${DOCUMENTS_LOCALE}" >> "$LOG" 269 [ "${DOCUMENTS_LOCALE}" = "" ] || mount --bind /run/$HL_USER/home/$GRP_USER/$HL_USER/Documents $HL_HOME/${DOCUMENTS_LOCALE} 1>> $LOG 2>>$LOG || true 270 echo "MOUNTING ${SHARE_LOCALE}" >> "$LOG" 271 [ "${SHARE_LOCALE}" = "" ] || mount --bind /run/$HL_USER/share $HL_HOME/${SHARE_LOCALE} 1>> $LOG 2>>$LOG || true 221 272 if [ "$GRP_USER" = "teachers" ]; then 222 273 # DELETE OLD DIRECTORIES FOR OTHER LANGUAGES … … 228 279 fi 229 280 done 230 [ "${SHARETEACHERS_LOCALE}" = "" ] || mount --bind /run/$HL_USER/teachers_share $HL_HOME/${SHARETEACHERS_LOCALE} || true231 281 for i in es_ES.UTF-8 ca_ES.UTF-8@Valencia ca_ES.UTF-8@valencia; do 232 282 DATA_ALUM_ERASE="$(/usr/bin/xdg_translator "$i" "Data_Alum")" … … 237 287 done 238 288 239 [ "${DESKTOP_LOCALE}" = "" ] || mount --bind /net/server-sync/teachers_share $HL_HOME/${SHARETEACHERS_LOCALE} || true 289 echo "MOUNTING ${SHARETEACHERS_LOCALE}" >> "$LOG" 290 [ -d ${HL_HOME}/${SHARETEACHERS_LOCALE} ] || mkdir ${HL_HOME}/${SHARETEACHERS_LOCALE} 291 [ "${SHARETEACHERS_LOCALE}" = "" ] || mount --bind /run/$HL_USER/teachers_share $HL_HOME/${SHARETEACHERS_LOCALE} 1>> $LOG 2>>$LOG || true 292 240 293 [ -d $HL_HOME/$DATA_ALUM ] || mkdir $HL_HOME/$DATA_ALUM 241 mount --bind /net/server-sync/home/students/ $HL_HOME/$DATA_ALUM || true 242 fi 243 [ "${GROUPSSHARE_LOCALE}" = "" ] || mount --bind /net/server-sync/groups_share $HL_HOME/${GROUPSSHARE_LOCALE} || true 294 [ "${DATA_ALUM}" = "" ] || mount --bind /run/$HL_USER/home/students $HL_HOME/$DATA_ALUM || true 295 fi 244 296 245 elif [ -d "/var/run/$HL_USER/home" ]; then 246 #Fat clients 247 echo "FATCLIENTS IN AULA" >> "$LOG" 248 [ "${DESKTOP_LOCALE}" = "" ] || mount --bind /run/$HL_USER/home/$GRP_USER/$HL_USER/Desktop $HL_HOME/${DESKTOP_LOCALE} || true 249 [ "${DOCUMENTS_LOCALE}" = "" ] || mount --bind /run/$HL_USER/home/$GRP_USER/$HL_USER/Documents $HLHOME/${DOCUMENTS_LOCALE} || true 250 [ "${SHARE_LOCALE}" = "" ] || mount --bind /run/$HL_USER/share $HL_HOME/${SHARE_LOCALE} || true 251 if [ "$GRP_USER" = "teachers" ]; then 252 # DELETE OLD DIRECTORIES FOR OTHER LANGUAGES 253 for i in es_ES.UTF-8 ca_ES.UTF-8@Valencia ca_ES.UTF-8@valencia; do 254 SHARETEACHERS_LOCALE_ERASE="$(/usr/bin/xdg_translator "$i" "Teachers_Share")" 255 if [ -d $HL_HOME/$SHARETEACHERS_LOCALE_ERASE ]; then 256 echo "Borrando $HL_HOME/$SHARETEACHERS_LOCALE_ERASE" >> "$LOG" 257 rm -d $HL_HOME/$SHARETEACHERS_LOCALE_ERASE >> "$LOG" 258 fi 259 done 260 [ "${SHARETEACHERS_LOCALE}" = "" ] || mount --bind /run/$HL_USER/teachers_share $HL_HOME/${SHARETEACHERS_LOCALE} || true 261 for i in es_ES.UTF-8 ca_ES.UTF-8@Valencia ca_ES.UTF-8@valencia; do 262 DATA_ALUM_ERASE="$(/usr/bin/xdg_translator "$i" "Data_Alum")" 263 if [ -d $HL_HOME/$DATA_ALUM_ERASE ]; then 264 echo "Borrando $HL_HOME/$DATA_ALUM_ERASE" >> "$LOG" 265 rm -d $HL_HOME/$DATA_ALUM_ERASE >> "$LOG" 266 fi 267 done 268 269 [ "${SHARETEACHERS_LOCALE}" = "" ] || mount --bind /run/$HL_USER/teachers_share $HL_HOME/${SHARETEACHERS_LOCALE} || true 270 [ -d $HL_HOME/$DATA_ALUM ] || mkdir $HL_HOME/$DATA_ALUM 271 mount --bind /run/$HL_USER/home/students $HL_HOME/$DATA_ALUM || true 272 fi 273 [ "${GROUPSSHARE_LOCALE}" = "" ] || mount --bind /run/$HL_USER/groups_share $HL_HOME/${GROUPSSHARE_LOCALE} || true 297 298 echo "MOUNTING ${GROUPSSHARE_LOCALE}" >> "$LOG" 299 [ "${GROUPSSHARE_LOCALE}" = "" ] || mount --bind /run/$HL_USER/groups_share $HL_HOME/${GROUPSSHARE_LOCALE} 1>> $LOG 2>>$LOG || true 300 274 301 fi 275 302 mv ${TEMP_NEW_USER_DIRS} ${LAST_LOGIN_DIRECTORIES} … … 291 318 chmod 600 "$USER_DIRS" 292 319 chown $HL_USER:$GRP_USER "$USER_DIRS" 293 294 date >> "$LOG" 320 echo "" >> "$LOG" 321 echo "******* MOUNT SCRIPT FINISHED - RESUME *****" >> "$LOG" 322 echo "--------------------------------------------" >> "$LOG" 323 echo "" >> "$LOG" 324 echo "lANGUAGE IS $AUX_LANG" >> "$LOG" 295 325 echo "" >> "$LOG" 296 326 echo "Las variables a tener en cuenta son:" >> "$LOG" … … 300 330 echo " \$DESKTOP_LOCALE -> $DESKTOP_LOCALE" >> "$LOG" 301 331 echo "" >> "$LOG" 302 echo "El idioma es $AUX_LANG" >> "$LOG" 303 echo "" >> "$LOG" 304 echo "AFTER HOME LINKER" >> "$LOG" 332 echo "----- HOME FROM USER AFTER HOME-LINKER ----" >> "$LOG" 305 333 tree $HL_HOME >> "$LOG" 306 334 echo "" >> "$LOG"
Note: See TracChangeset
for help on using the changeset viewer.