summaryrefslogtreecommitdiff
path: root/cryptfs.in
diff options
context:
space:
mode:
Diffstat (limited to 'cryptfs.in')
-rw-r--r--cryptfs.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/cryptfs.in b/cryptfs.in
index 0dd1637..8b5d1a8 100644
--- a/cryptfs.in
+++ b/cryptfs.in
@@ -39,7 +39,7 @@ start)
do
if ! mountpoint -q "${neededKeyFs}"
then
- if echo "${fsTab}" | grep -q "^\(ssh\|ftp\)fs#\S*\s\+${neededKeyFs}\s"
+ if echo "${fsTab}" | grep -q "^\S\+\s\+${neededKeyFs}\s\+fuse\.\(ssh\|ftp\)fs\s"
then
maxWait=120
while [ ${maxWait} -gt 0 ] && ! /sbin/ip -o addr show scope global | grep -q '\S'
@@ -50,8 +50,8 @@ start)
done
host="$(
echo "${fsTab}" | \
- grep -m1 "^\(ssh\|ftp\)fs#\S*\s\+${neededKeyFs}\s" | \
- sed "s>^\(ssh\|ftp\)fs#\([^ :@]*@\)\?\([^ :@]\+\)\(:\S\+\)\?\s\+${neededKeyFs}\s.*$>\3>"
+ grep -m1 "^\S\+\s\+${neededKeyFs}\s\+fuse\.\(ssh\|ftp\)fs\s" | \
+ sed "s>^\([^ :@]*@\)\?\([^ :@]\+\)\(:\S\+\)\?\s\+${neededKeyFs}\s.*$>\2>"
)"
while [ ${maxWait} -gt 0 ] && ! /bin/ping6 -c1 ${host} &> /dev/null && ! /bin/ping -c1 ${host} &> /dev/null
do