Attachment #175499 for bug #213275

View | Details | Raw Unified | Return to bug 213275
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/sysutils/avfs/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= avfs	4	PORTNAME= avfs
5	PORTVERSION= 1.0.3	5	PORTVERSION= 1.0.4
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= SF/avf/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/avf/${PORTNAME}/${PORTVERSION}
8		8

Lines 1-2 Link Here

(-)b/sysutils/avfs/distinfo (-2 / +3 lines)
1	SHA256 (avfs-1.0.3.tar.bz2) = c6dee77b2b71567528f897727e51695587189765fc35f694e4734db0a7d4fec8	1	TIMESTAMP = 1474051275
2	SIZE (avfs-1.0.3.tar.bz2) = 722861	2	SHA256 (avfs-1.0.4.tar.bz2) = 6b652120d9ed8730a9dcfd161d0e68481d176e854d94bed67754cb7b03e0b100
		3	SIZE (avfs-1.0.4.tar.bz2) = 719761

Line 0 Link Here

(-)b/sysutils/avfs/files/patch-scripts_mountavfs (+11 lines)
	1	--- scripts/mountavfs.orig 2016-09-16 18:43:19 UTC
	2	+++ scripts/mountavfs
	3	@@ -14,7 +14,7 @@ else
	4	MntDir=${HOME}/.avfs
	5	fi
	6
	7	-grep -qE "avfsd ${MntDir}" /proc/mounts \|\| {
	8	+mount -p \| grep -qE "${MntDir}.*fusefs" \|\| {
	9	if [ ! -e "$MntDir" ]; then
	10	mkdir -p "$MntDir"
	11	fi

Removed Link Here

(-)a/sysutils/avfs/files/patch-scripts_mountavs (-11 lines)
1	--- scripts/mountavfs.orig 2015-02-07 16:14:05.773404035 +0600
2	+++ scripts/mountavfs 2015-02-07 16:14:56.488399333 +0600
3	@@ -14,7 +14,7 @@
4	MntDir=${HOME}/.avfs
5	fi
6
7	-grep -qE "avfsd ${MntDir}" /proc/mounts \|\| {
8	+mount -p \| grep -qE "${MntDir}.*fusefs" \|\| {
9	if [ ! -e "$MntDir" ]; then
10	mkdir -p "$MntDir"
11	fi




--- scripts/umountavfs.orig	2016-09-16 18:43:19 UTC
+++ scripts/umountavfs
@@ -14,11 +14,11 @@ else
     MntDir="${HOME}/.avfs"
 fi
 
-grep -qE "${MntDir}.*avfsd" /proc/mounts && {
+mount -p | grep -qE "${MntDir}.*fusefs" && {
    echo unMounting AVFS on $MntDir...
    if type -p fusermount > /dev/null 2>&1 ; then
       fusermount -u -z "$MntDir"
    else
-      umount -l "$MntDir"
+      umount "$MntDir"
    fi
 }




--- scripts/umountavfs.orig	2015-02-07 16:14:17.372402564 +0600
+++ scripts/umountavfs	2015-02-07 16:15:29.270400346 +0600
@@ -14,11 +14,11 @@
     MntDir="${HOME}/.avfs"
 fi
 
-grep -qE "${MntDir}.*avfsd" /proc/mounts && {
+mount -p | grep -qE "${MntDir}.*fusefs" && {
    echo unMounting AVFS on $MntDir...
    if type -p fusermount > /dev/null 2>&1 ; then
       fusermount -u -z "$MntDir"
    else
-      umount -l "$MntDir"
+      umount "$MntDir"
    fi
 }

Return to bug 213275

Line 0 Link Here

(-)b/sysutils/avfs/files/patch-scripts_umountavfs (+16 lines)
	1	--- scripts/umountavfs.orig 2016-09-16 18:43:19 UTC
	2	+++ scripts/umountavfs
	3	@@ -14,11 +14,11 @@ else
	4	MntDir="${HOME}/.avfs"
	5	fi
	6
	7	-grep -qE "${MntDir}.*avfsd" /proc/mounts && {
	8	+mount -p \| grep -qE "${MntDir}.*fusefs" && {
	9	echo unMounting AVFS on $MntDir...
	10	if type -p fusermount > /dev/null 2>&1 ; then
	11	fusermount -u -z "$MntDir"
	12	else
	13	- umount -l "$MntDir"
	14	+ umount "$MntDir"
	15	fi
	16	}

Removed Link Here

(-)a/sysutils/avfs/files/patch-scripts_umountavs (-16 lines)
1	--- scripts/umountavfs.orig 2015-02-07 16:14:17.372402564 +0600
2	+++ scripts/umountavfs 2015-02-07 16:15:29.270400346 +0600
3	@@ -14,11 +14,11 @@
4	MntDir="${HOME}/.avfs"
5	fi
6
7	-grep -qE "${MntDir}.*avfsd" /proc/mounts && {
8	+mount -p \| grep -qE "${MntDir}.*fusefs" && {
9	echo unMounting AVFS on $MntDir...
10	if type -p fusermount > /dev/null 2>&1 ; then
11	fusermount -u -z "$MntDir"
12	else
13	- umount -l "$MntDir"
14	+ umount "$MntDir"
15	fi
16	}