Ubuntu Pastebin

Paste from didrocks at Thu, 19 Feb 2015 16:59:28 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 834476c..25999cd 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -124,7 +124,7 @@ static void remove_client(Client **first, Client *item) {
 static void on_plymouth_disconnect(Manager *m) {
         safe_close(m->plymouth_fd);
         m->plymouth_fd = -1;
-        m->plymouth_cancel_sent = false;
+        m->plymouth_cancel_sent = true;
 }
 
 static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
@@ -188,7 +188,7 @@ static int send_message_plymouth(Manager *m, const char *message) {
                 if (r < 0)
                         log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
         } else if (m->numdevices == 0) {
-                m->plymouth_cancel_sent = false;
+                m->plymouth_cancel_sent = true;
                 r = send_message_plymouth_socket(m->plymouth_fd, "", false);
                 if (r < 0)
                         log_warning_errno(r, "Can't clear plymouth filesystem cancel message: %m");
@@ -405,6 +405,7 @@ static int manager_new(Manager **ret, int fd) {
                 return r;
 
         m->connection_fd = fd;
+        m->plymouth_cancel_sent = true;
         if (access("/run/systemd/show-status", F_OK) >= 0) {
                 m->console = fopen("/dev/console", "we");
                 if (!m->console)
Download as text