From bd118f8e2262d5703120442aa48bd942d2116b75 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 May 2011 18:55:39 +0200 Subject: [PATCH] user-sessions: ignore EROFS when unlinking /etc/nologin if the file doesn't exist anyway --- src/user-sessions.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/user-sessions.c b/src/user-sessions.c index 4518d953..e045b88c 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) -- 2.39.5