Attachment 98491 Details for Bug 73942 – dont overwrite crypt password prompt with status messages

[patch] dont overwrite crypt password prompt with status messages

keep-crypt-password-prompt.patch (text/plain), 1.25 KB, created by Thomas Blume on 2014-05-05 14:36:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Blume

Created: 2014-05-05 14:36:24 UTC

Size: 1.25 KB

patch

obsolete

>--- systemd-210/src/core/manager.c	2014-05-05 11:46:17.700483956 +0200
>+++ systemd-210/src/core/manager.c	2014-05-05 13:29:13.296503646 +0200
>@@ -152,6 +152,29 @@
>         }
> }
> 
>+static int check_for_password_prompt(void) {
>+        DIR *d;
>+        struct dirent *de;
>+
>+        if (!(d = opendir("/run/systemd/ask-password"))) {
>+                log_error("opendir(): %m");
>+
>+                if (errno == ENOENT)
>+                        return 1;
>+
>+                return -errno;
>+        }
>+
>+        while ((de = readdir(d))) {
>+                if (startswith(de->d_name, "ask.")) {
>+                        closedir(d);
>+                        return 0;
>+                }
>+        }
>+        closedir(d);
>+        return 1;
>+}
>+
> static void manager_print_jobs_in_progress(Manager *m) {
>         static int is_ansi_console = -1;
>         _cleanup_free_ char *job_of_n = NULL;
>@@ -195,6 +217,10 @@
> 
>         m->jobs_in_progress_iteration++;
> 
>+        //don't overwrite the crypt password prompt with job status messages
>+        if (check_for_password_prompt() == 0);
>+                return 0;
>+
>         if (m->n_running_jobs > 1)
>                 if (asprintf(&job_of_n, "(%u of %u) ", counter, m->n_running_jobs) < 0)
>                         job_of_n = NULL;

Actions: View | Splinter Review

Attachments on bug 73942: 92601 | 98491

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.