From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 Aug 2014 21:15:51 +0000 (+0200)
Subject: util: try to be a bit more NFS compatible when checking whether an FS is writable
X-Git-Tag: v216~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=70421bdce2719d76efffd8afdc28433c75aac5a2;hp=3f3cc397043e69c9e9a690194a6a1043bf6466c5;p=elogind.git

util: try to be a bit more NFS compatible when checking whether an FS is writable

https://bugs.freedesktop.org/show_bug.cgi?id=81169
---

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 57554cd29..67566bc76 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -533,7 +533,16 @@ int path_is_read_only_fs(const char *path) {
         if (statvfs(path, &st) < 0)
                 return -errno;
 
-        return !!(st.f_flag & ST_RDONLY);
+        if (st.f_flag & ST_RDONLY)
+                return true;
+
+        /* On NFS, statvfs() might not reflect whether we can actually
+         * write to the remote share. Let's try again with
+         * access(W_OK) which is more reliable, at least sometimes. */
+        if (access(path, W_OK) < 0 && errno == EROFS)
+                return true;
+
+        return false;
 }
 
 int path_is_os_tree(const char *path) {