Changeset 2658 for lliurex-emblemador
- Timestamp:
- Oct 21, 2016, 9:57:58 AM (3 years ago)
- Location:
- lliurex-emblemador/trunk/fuentes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-emblemador/trunk/fuentes/debian/changelog
r2546 r2658 1 lliurex-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 1 7 lliurex-emblemador (0.2) xenial; urgency=medium 2 8 -
lliurex-emblemador/trunk/fuentes/lliurex-emblemador.install/usr/bin/emblemador
r2545 r2658 29 29 # SEMI-LIGERO (linked dirs from /net/server-sync). 30 30 31 test_fat=`mount |grep -i desktop|egrep '^/run'|wc -l`31 #test_fat=`mount |grep -i desktop|egrep '^/run'|wc -l` 32 32 test_semi=`ls -l ${HOME}|grep -i desktop|egrep '^lrwx'|wc -l` 33 test_lig=`mount |grep -i desktop|egrep '^/net/server'|wc -l` 33 test_fat=`findmnt -l |grep -i desktop|egrep '^/run'|wc -l` 34 #test_lig=`mount |grep -i desktop|egrep '^/net/server'|wc -l` 35 test_lig=`finmnt -l |grep -i desktop|egrep '^/net/server'|wc -l` 34 36 35 37 if [ $test_fat -gt 0 ]; then … … 44 46 45 47 fi 48 49 echo $TIPO 46 50 47 51 if [ "x$TIPO" != "xfat" -a "x$TIPO" != "xsemi" -a "x$TIPO" != "xlig" -a "x$TIPO" != "xserver" ]; then … … 58 62 US=local 59 63 else 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` 61 66 if [ $test_student -gt 0 ]; then 62 67 US=students 63 68 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` 65 71 if [ $test_teacher -gt 0 ]; then 66 72 US=teachers … … 82 88 83 89 if [ "x$TIPO" = "x" -o "x$US" = "x" ]; then 90 echo $TIPO - $US 84 91 echo "Error user detected, aborting..." 85 92 exit 1
Note: See TracChangeset
for help on using the changeset viewer.