diff --git a/src/mounts.js b/src/mounts.js index f78b3274a..114856a82 100644 --- a/src/mounts.js +++ b/src/mounts.js @@ -71,7 +71,7 @@ function renderMountFile(volume) { case 'nfs': type = 'nfs'; what = `${mountOptions.host}:${mountOptions.remoteDir}`; - options = 'noauto,x-systemd.automount'; // _netdev is implicit + options = 'noauto'; // noauto means it is not a blocker for local-fs.target. _netdev is implicit. rw,hard,tcp,rsize=8192,wsize=8192,timeo=14 break; case 'ext4': type = 'ext4'; diff --git a/src/scripts/addmount.sh b/src/scripts/addmount.sh index 0ca55bb15..6b75c7d2d 100755 --- a/src/scripts/addmount.sh +++ b/src/scripts/addmount.sh @@ -33,6 +33,6 @@ systemctl daemon-reload # systemd can automatically create the "where" dir but the backup logic relies on permissions mkdir -p "${where}" -chown yellowtent:yellowtent "${where}" +chown yellowtent:yellowtent "${where}" || true # this can fail with nfs+root_squash systemctl enable --no-block --now "${mount_filename}" || true