From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Sep 2012 16:28:40 +0000 (+0200)
Subject: main: newer kernels return EINVAL if we invoke reboot() in a container lacking perms... 
X-Git-Tag: v190~51
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c9999773927020a011f1d14ea03ae41431217b89

main: newer kernels return EINVAL if we invoke reboot() in a container lacking perms, deal with it
---

diff --git a/src/core/manager.c b/src/core/manager.c
index b0357b71f..cf0691719 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -138,8 +138,9 @@ static int enable_special_signals(Manager *m) {
         assert(m);
 
         /* Enable that we get SIGINT on control-alt-del. In containers
-         * this will fail with EPERM, so ignore that. */
-        if (reboot(RB_DISABLE_CAD) < 0 && errno != EPERM)
+         * this will fail with EPERM (older) or EINVAL (newer), so
+         * ignore that. */
+        if (reboot(RB_DISABLE_CAD) < 0 && errno != EPERM && errno != EINVAL)
                 log_warning("Failed to enable ctrl-alt-del handling: %m");
 
         fd = open_terminal("/dev/tty0", O_RDWR|O_NOCTTY|O_CLOEXEC);