Merge lp:~didrocks/ubuntustudio-look/new-systemd-fsck into lp:~ubuntustudio-core/+junk/look

[Didier Roche-Tolomelli]

Adding fsck support with systemd. Uploaded to vivid.
(you should be able to pull/push that branch directly)

Aside note: can you please make sure that your branch is writable for people having upload rights to your packages? All other teams and flavors and ensuring this. Thanks!

[Kaj Ailomaa (zequence)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-18 09:00:57 +0000
+++ debian/changelog	2015-02-25 12:14:23 +0000
@@ -1,4 +1,11 @@
-ubuntustudio-look (0.48) UNRELEASED; urgency=low
+ubuntustudio-look (0.49) vivid; urgency=medium
+
+  * Add fsck report and cancel support with systemd to the logo theme
+    (LP: #1425434)
+
+ -- Didier Roche <[e-mail]>  Wed, 25 Feb 2015 13:09:27 +0100
+
+ubuntustudio-look (0.48) trusty; urgency=low
 
   * Made wallpapers selectable from both XFCE and Gnome based DEs
     (lp: #1292550)
 
=== modified file 'lib/plymouth/themes/ubuntustudio-logo/mdv.script'
--- lib/plymouth/themes/ubuntustudio-logo/mdv.script	2011-01-25 02:58:53 +0000
+++ lib/plymouth/themes/ubuntustudio-logo/mdv.script	2015-02-25 12:14:23 +0000
@@ -1,5 +1,12 @@
 # Ubuntu Studio Plymouth theme
 
+fun strlen (string) {
+  i = 0;
+  while (String(string).CharAt(i))
+    i++;
+  return i;
+}
+
 Window.GetMaxWidth = fun (){
   i = 0;
   width = 0;
@@ -193,7 +200,11 @@
 
 fun display_message_callback (prompt)
   {
-  
+
+# Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n
+if (prompt.SubString(0, 17) == "fsckd-cancel-msg:")
+    prompt = prompt.SubString(17, strlen(prompt));
+
 prompt = Image.Text(prompt,1.0, 1.0, 1.0);
 sprite_prompt.SetImage(prompt);
 sprite_prompt.SetPosition(Window.GetX() + (Window.GetWidth() - prompt.GetWidth()) / 2, Window.GetY() + Window.GetHeight() * 0.93, 2);