diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-24 15:23:01 -0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-24 19:02:12 -0300 |
| commit | 842865365e598a090045894f8990fd384e801ccb (patch) | |
| tree | 5c51d50ebb012ed76c3b6ed8f77ab8bce0f21984 /src/login | |
| parent | 391a4f72422ab18c0a6b5f291fa47f8d606b9e14 (diff) | |
logind: don't busy loop if a job is still running but the delay timeout expires
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-dbus.c | 3 | ||||
| -rw-r--r-- | src/login/logind.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 05cc1fdd13..68e499f52c 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2400,7 +2400,6 @@ DBusHandlerResult bus_message_filter( log_error("Failed to parse JobRemoved message: %s", bus_error_message(&error)); else if (m->action_job && streq(m->action_job, path)) { - log_info("Operation finished."); /* Tell people that they now may take a lock again */ @@ -2441,7 +2440,7 @@ int manager_dispatch_delayed(Manager *manager) { assert(manager); - if (!manager->action_unit || manager->action_job) + if (manager->action_what == 0 || manager->action_job) return 0; /* Continue delay? */ diff --git a/src/login/logind.c b/src/login/logind.c index 3b9da19858..536612cbd2 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -1626,7 +1626,7 @@ int manager_run(Manager *m) { manager_gc(m, true); - if (m->action_what != 0) { + if (m->action_what != 0 && !m->action_job) { usec_t x, y; x = now(CLOCK_MONOTONIC); |