From 70421bdce2719d76efffd8afdc28433c75aac5a2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 18 Aug 2014 23:15:51 +0200 Subject: [PATCH] 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 --- src/shared/path-util.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git src/shared/path-util.c src/shared/path-util.c index 57554cd..67566bc 100644 --- src/shared/path-util.c +++ 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) { -- 1.7.9.2