Ubuntu Pastebin

Paste from Martin Pitt at Wed, 18 Feb 2015 07:27:30 +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
--- a/debian/patches/Connect-to-plymouth-and-support-cancellation-of-in-p.patch
+++ b/debian/patches/Connect-to-plymouth-and-support-cancellation-of-in-p.patch
@@ -252,7 +252,7 @@ index 6b2eeb0..30c4f28 100644
 +                if (r < 0)
 +                        return log_warning_errno(errno, "Can't send to plymouth cancel key: %m");
 +                m->plymouth_cancel_sent = true;
-+                plymouth_cancel_message = strappenda("fsckd-cancel-msg:", "Press Ctrl+C to cancel all filesystem checks in progress");
++                plymouth_cancel_message = strjoina("fsckd-cancel-msg:", "Press Ctrl+C to cancel all filesystem checks in progress");
 +                r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false);
 +                if (r < 0)
 +                        log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
diff --git a/debian/patches/Translate-fsckd-messages-for-plymouth.patch b/debian/patches/Translate-fsckd-messages-for-plymouth.patch
index f87880b..ce10caa 100644
--- a/debian/patches/Translate-fsckd-messages-for-plymouth.patch
+++ b/debian/patches/Translate-fsckd-messages-for-plymouth.patch
@@ -35,8 +35,8 @@ index 30c4f28..2143e1c 100644
                  if (r < 0)
                          return log_warning_errno(errno, "Can't send to plymouth cancel key: %m");
                  m->plymouth_cancel_sent = true;
--                plymouth_cancel_message = strappenda("fsckd-cancel-msg:", "Press Ctrl+C to cancel all filesystem checks in progress");
-+                plymouth_cancel_message = strappenda("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"));
+-                plymouth_cancel_message = strjoina("fsckd-cancel-msg:", "Press Ctrl+C to cancel all filesystem checks in progress");
++                plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"));
                  r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false);
                  if (r < 0)
                          log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
Download as text