X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fuser-sessions.c;h=e045b88c10d9c67fbee7aee38cfb3f97a54a4399;hb=9131f660eedb29d18a29e6efff49c485e683c56c;hp=4518d953ed7bebc80b3f110d2981ee3961391278;hpb=db019b8dd206844dcf5fde661256dc71fcc06fef;p=elogind.git

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)