Changeset 2658 for lliurex-emblemador

Timestamp:

Oct 21, 2016, 9:57:58 AM (4 years ago)

Author:

Juanma

Message:

Replaced mount with findmnt for bind mounts detection

Location:

lliurex-emblemador/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-emblemador.install/usr/bin/emblemador (modified) (4 diffs)

lliurex-emblemador/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-emblemador (0.2-lliurex1) xenial; urgency=medium
+
+  * Replaced mount with findmnt for bind mounts detection
+
+ -- Juanma Navarro Mañez <juanma1980@gmail.com>  Fri, 21 Oct 2016 09:52:18 +0200
+
 lliurex-emblemador (0.2) xenial; urgency=medium
 

lliurex-emblemador/trunk/fuentes/lliurex-emblemador.install/usr/bin/emblemador

@@ -29 +29 @@
 # SEMI-LIGERO (linked dirs from /net/server-sync).
 
-test_fat=`mount |grep -i desktop|egrep '^/run'|wc -l`
+#test_fat=`mount |grep -i desktop|egrep '^/run'|wc -l`
 test_semi=`ls -l ${HOME}|grep -i desktop|egrep '^lrwx'|wc -l`
-test_lig=`mount |grep -i desktop|egrep '^/net/server'|wc -l`
+test_fat=`findmnt -l |grep -i desktop|egrep '^/run'|wc -l`
+#test_lig=`mount |grep -i desktop|egrep '^/net/server'|wc -l`
+test_lig=`finmnt -l |grep -i desktop|egrep '^/net/server'|wc -l`
 
 if [ $test_fat -gt 0 ]; then
@@ -44 +46 @@
 
 fi
+
+echo $TIPO
 
 if [ "x$TIPO" != "xfat" -a "x$TIPO" != "xsemi" -a "x$TIPO" != "xlig" -a "x$TIPO" != "xserver" ]; then
@@ -58 +62 @@
     US=local
 else
-    test_student=`mount|grep -i desktop|grep -i student|wc -l`
+#    test_student=`mount|grep -i desktop|grep -i student|wc -l`
+    test_student=`findmnt -l |grep -i desktop|grep -i student|wc -l`
     if [ $test_student -gt 0 ]; then
         US=students
     else
-        test_teacher=`mount|grep -i desktop|grep -i teacher|wc -l`
+#       test_teacher=`mount|grep -i desktop|grep -i teacher|wc -l`
+        test_teacher=`findmnt -l|grep -i desktop|grep -i teacher|wc -l`
         if [ $test_teacher -gt 0 ]; then
             US=teachers
@@ -82 +88 @@
 
 if [ "x$TIPO" = "x" -o "x$US" = "x" ]; then
+    echo $TIPO - $US
     echo "Error user detected, aborting..."
     exit 1