Skip to content

Commit

Permalink
Merge pull request #39 from LooseSeal2/v8.6
Browse files Browse the repository at this point in the history
fix Fatal error: failed to umount FUSE
  • Loading branch information
MrDoobPG committed Jun 22, 2019
2 parents 22c35a1 + bde9c6d commit 6ff606e
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 33 deletions.
6 changes: 3 additions & 3 deletions functions/mountnumbers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RClone Variable Name Default ~ Current Settings
[6] VFS-Cache-Mode off [$vfs_cm]
[7] VFS-Cache-Max-Age 1h [$vfs_cma]
[8] VFS-Cache-Max-Size off [$vfs_cms]
[9] Log-Level INFO [$vfs_ll]
[9] Log-Level NOTICE [$vfs_ll]
[Z] Exit
Please read the wiki on how changing these settings impact stability and performance!
Expand Down Expand Up @@ -198,8 +198,8 @@ Set this value to 0 to disable."
start="1"
end="4"
note="1) DEBUG: It outputs lots of debug info, useful for bug reports and vfs options tuning.
2) INFO (recommended): It outputs information about each transfer and prints stats once a minute by default.
3) NOTICE: It outputs very little when things are working normally. It outputs warnings and significant events.
2) INFO: It outputs information about each transfer and prints stats once a minute by default.
3) NOTICE (recommended): It outputs very little when things are working normally. It outputs warnings and significant events.
4) ERROR: It only outputs error messages."
fi

Expand Down
2 changes: 1 addition & 1 deletion functions/rcloneinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
rcloneinstall () {

# install what version of rclone
rversion=1.47
rversion=1.48

if [[ ! -e "/root/.config/rclone/rclone.conf" ]]; then
touch /root/.config/rclone/rclone.conf; fi
Expand Down
2 changes: 1 addition & 1 deletion functions/variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ else dversionoutput="None"; fi
variable /var/plexguide/vfs_rcsl "2048M"
vfs_rcsl=$(cat /var/plexguide/vfs_rcsl)

variable /var/plexguide/vfs_ll "INFO"
variable /var/plexguide/vfs_ll "NOTICE"
vfs_ll=$(cat /var/plexguide/vfs_ll)


Expand Down
23 changes: 10 additions & 13 deletions mounts/crypt.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,25 @@ User=0
Group=0
ExecStart=/usr/bin/rclone mount {{drive}}: /mnt/{{drive}} \
--config /opt/appdata/plexguide/rclone.conf \
--allow-other --allow-non-empty \
--size-only \
--fast-list \
--use-mmap \
--uid=1000 --gid=1000 \
--umask 002 \
--drive-skip-gdocs \
--uid=1000 --gid=1000 --umask 002 \
--log-file=/var/plexguide/logs/rclone-{{drive}}.log \
--log-level {{vfs_ll}} \
--user-agent="{{uagent.stdout}}" \
--allow-non-empty \
--allow-other \
--timeout 1h \
--fast-list \
--use-mmap \
--user-agent="{{uagent.stdout}}" \
--dir-cache-time {{vfs_dct}} \
--vfs-cache-mode {{vfs_cm}} \
--vfs-cache-max-age {{vfs_cma}} \
--vfs-cache-max-size {{vfs_cms}} \
--buffer-size {{vfs_bs}} \
--vfs-read-chunk-size-limit {{vfs_rcsl}} \
--vfs-read-chunk-size {{vfs_rcs}} \
--vfs-read-chunk-size-limit {{vfs_rcsl}}

--buffer-size {{vfs_bs}}

ExecStop=/bin/fusermount -uz /mnt/{{drive}}
TimeoutStopSec=20
ExecStop=/bin/fusermount -uzq /mnt/{{drive}}
TimeoutStopSec=30
KillMode=process
RemainAfterExit=yes

Expand Down
24 changes: 10 additions & 14 deletions mounts/drive.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,25 @@ User=0
Group=0
ExecStart=/usr/bin/rclone mount {{drive}}: /mnt/{{drive}} \
--config /opt/appdata/plexguide/rclone.conf \
--allow-other --allow-non-empty \
--size-only \
--fast-list \
--use-mmap \
--uid=1000 --gid=1000 \
--umask 002 \
--drive-skip-gdocs \
--drive-use-trash=false \
--uid=1000 --gid=1000 --umask 002 \
--log-file=/var/plexguide/logs/rclone-{{drive}}.log \
--log-level {{vfs_ll}} \
--user-agent="{{uagent.stdout}}" \
--allow-non-empty \
--allow-other \
--timeout 1h \
--fast-list \
--use-mmap \
--user-agent="{{uagent.stdout}}" \
--dir-cache-time {{vfs_dct}} \
--vfs-cache-mode {{vfs_cm}} \
--vfs-cache-max-age {{vfs_cma}} \
--vfs-cache-max-size {{vfs_cms}} \
--buffer-size {{vfs_bs}} \
--vfs-read-chunk-size-limit {{vfs_rcsl}} \
--vfs-read-chunk-size {{vfs_rcs}} \
--vfs-read-chunk-size-limit {{vfs_rcsl}}

--buffer-size {{vfs_bs}}

ExecStop=/bin/fusermount -uz /mnt/{{drive}}
TimeoutStopSec=20
ExecStop=/bin/fusermount -uzq /mnt/{{drive}}
TimeoutStopSec=30
KillMode=process
RemainAfterExit=yes

Expand Down
2 changes: 1 addition & 1 deletion roles/rcloneinstall/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
#rclone version can be defined as a release number or as beta
rclone_version: "1.47.0"
rclone_version: "1.48.0"

# Defaults in case no variables for OS are chosen
PACKAGES:
Expand Down

0 comments on commit 6ff606e

Please sign in to comment.