Changeset 2658


Ignore:
Timestamp:
Oct 21, 2016, 9:57:58 AM (3 years ago)
Author:
Juanma
Message:

Replaced mount with findmnt for bind mounts detection

Location:
lliurex-emblemador/trunk/fuentes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lliurex-emblemador/trunk/fuentes/debian/changelog

    r2546 r2658  
     1lliurex-emblemador (0.2-lliurex1) xenial; urgency=medium
     2
     3  * Replaced mount with findmnt for bind mounts detection
     4
     5 -- Juanma Navarro Mañez <juanma1980@gmail.com>  Fri, 21 Oct 2016 09:52:18 +0200
     6
    17lliurex-emblemador (0.2) xenial; urgency=medium
    28
  • lliurex-emblemador/trunk/fuentes/lliurex-emblemador.install/usr/bin/emblemador

    r2545 r2658  
    2929# SEMI-LIGERO (linked dirs from /net/server-sync).
    3030
    31 test_fat=`mount |grep -i desktop|egrep '^/run'|wc -l`
     31#test_fat=`mount |grep -i desktop|egrep '^/run'|wc -l`
    3232test_semi=`ls -l ${HOME}|grep -i desktop|egrep '^lrwx'|wc -l`
    33 test_lig=`mount |grep -i desktop|egrep '^/net/server'|wc -l`
     33test_fat=`findmnt -l |grep -i desktop|egrep '^/run'|wc -l`
     34#test_lig=`mount |grep -i desktop|egrep '^/net/server'|wc -l`
     35test_lig=`finmnt -l |grep -i desktop|egrep '^/net/server'|wc -l`
    3436
    3537if [ $test_fat -gt 0 ]; then
     
    4446
    4547fi
     48
     49echo $TIPO
    4650
    4751if [ "x$TIPO" != "xfat" -a "x$TIPO" != "xsemi" -a "x$TIPO" != "xlig" -a "x$TIPO" != "xserver" ]; then
     
    5862    US=local
    5963else
    60     test_student=`mount|grep -i desktop|grep -i student|wc -l`
     64#    test_student=`mount|grep -i desktop|grep -i student|wc -l`
     65    test_student=`findmnt -l |grep -i desktop|grep -i student|wc -l`
    6166    if [ $test_student -gt 0 ]; then
    6267        US=students
    6368    else
    64         test_teacher=`mount|grep -i desktop|grep -i teacher|wc -l`
     69#       test_teacher=`mount|grep -i desktop|grep -i teacher|wc -l`
     70        test_teacher=`findmnt -l|grep -i desktop|grep -i teacher|wc -l`
    6571        if [ $test_teacher -gt 0 ]; then
    6672            US=teachers
     
    8288
    8389if [ "x$TIPO" = "x" -o "x$US" = "x" ]; then
     90    echo $TIPO - $US
    8491    echo "Error user detected, aborting..."
    8592    exit 1
Note: See TracChangeset for help on using the changeset viewer.