From 5020ff99b96a8e42a74bb02f47077414ecfc9a19 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 10 Mar 2015 09:28:02 +0100 Subject: [PATCH] releasing package lubuntu-artwork version 0.52 --- debian/changelog | 7 ++++++ .../themes/lubuntu-logo/lubuntu-logo.script | 24 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/debian/changelog b/debian/changelog index 412019f..6c5642c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lubuntu-artwork (0.52) vivid; urgency=medium + + * Add fsck report and cancel support with systemd to the logo theme + (LP: #1425434) + + -- Didier Roche Wed, 25 Feb 2015 13:18:24 +0100 + lubuntu-artwork (0.51) vivid; urgency=medium * usr/share/icons: diff --git a/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script b/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script index f8f577d..9a6f26a 100644 --- a/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script +++ b/src/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script @@ -473,6 +473,13 @@ fun message_callback (message) if (keys != NULL) message = StringCopy (message, keys + StringLength(local.substring), NULL); + # Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n + substring = "fsckd-cancel-msg:"; + keys = StringString(message, substring); + if (keys != NULL) + message = StringCopy(message, keys + StringLength(substring), NULL); + + local.label.is_fake = is_fake; label = get_message_label(message, is_fake, is_action_line); label.z = 10000; @@ -983,6 +990,23 @@ fun update_status_callback (status) { } + # systemd-fsckd pass fsckd::: + if (update_strings[0] == "fsckd") { + number_devices = StringToInteger(update_strings[1]); + + if (number_devices > 0) { + label = update_strings[3]; + + progress_label = get_fsck_label (label, 0); + progress_label.sprite = Sprite (progress_label.image); + progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); + progress_label.sprite.SetOpacity (1); + } else { + if (progress_label.sprite) + progress_label.sprite.SetOpacity (0); + } + } + } Plymouth.SetUpdateStatusFunction (update_status_callback);