From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 May 2011 16:55:39 +0000 (+0200)
Subject: user-sessions: ignore EROFS when unlinking /etc/nologin if the file doesn't exist... 
X-Git-Tag: v27~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bd118f8e2262d5703120442aa48bd942d2116b75;hp=e4c1d706bdea47c2a61e626e66ca3e8489c9f08e;p=elogind.git

user-sessions: ignore EROFS when unlinking /etc/nologin if the file doesn't exist anyway
---

diff --git a/src/user-sessions.c b/src/user-sessions.c
index 4518d953e..e045b88c1 100644
--- a/src/user-sessions.c
+++ b/src/user-sessions.c
@@ -48,8 +48,16 @@ int main(int argc, char*argv[]) {
                 }
 
                 if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
-                        log_error("Failed to remove /etc/nologin file: %m");
-                        q = -errno;
+
+                        /* If the file doesn't exist and /etc simply
+                         * was read-only (in which case unlink()
+                         * returns EROFS even if the file doesn't
+                         * exist), don't complain */
+
+                        if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) {
+                                log_error("Failed to remove /etc/nologin file: %m");
+                                q = -errno;
+                        }
                 }
 
                 if (r < 0 || q < 0)