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

Proposed by Didier Roche
Status: Merged
Merged at revision: 165
Proposed branch: lp:~didrocks/ubuntustudio-look/new-systemd-fsck
Merge into: lp:~ubuntustudio-core/+junk/look
Diff against target: 46 lines (+20/-2)
2 files modified
debian/changelog (+8/-1)
lib/plymouth/themes/ubuntustudio-logo/mdv.script (+12/-1)
To merge this branch: bzr merge lp:~didrocks/ubuntustudio-look/new-systemd-fsck
Reviewer Review Type Date Requested Status
Kaj Ailomaa (community) Approve
Review via email: mp+250908@code.launchpad.net

Description of the change

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!

To post a comment you must log in.
Revision history for this message
Kaj Ailomaa (zequence) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-18 09:00:57 +0000
3+++ debian/changelog 2015-02-25 12:14:23 +0000
4@@ -1,4 +1,11 @@
5-ubuntustudio-look (0.48) UNRELEASED; urgency=low
6+ubuntustudio-look (0.49) vivid; urgency=medium
7+
8+ * Add fsck report and cancel support with systemd to the logo theme
9+ (LP: #1425434)
10+
11+ -- Didier Roche <didrocks@ubuntu.com> Wed, 25 Feb 2015 13:09:27 +0100
12+
13+ubuntustudio-look (0.48) trusty; urgency=low
14
15 * Made wallpapers selectable from both XFCE and Gnome based DEs
16 (lp: #1292550)
17
18=== modified file 'lib/plymouth/themes/ubuntustudio-logo/mdv.script'
19--- lib/plymouth/themes/ubuntustudio-logo/mdv.script 2011-01-25 02:58:53 +0000
20+++ lib/plymouth/themes/ubuntustudio-logo/mdv.script 2015-02-25 12:14:23 +0000
21@@ -1,5 +1,12 @@
22 # Ubuntu Studio Plymouth theme
23
24+fun strlen (string) {
25+ i = 0;
26+ while (String(string).CharAt(i))
27+ i++;
28+ return i;
29+}
30+
31 Window.GetMaxWidth = fun (){
32 i = 0;
33 width = 0;
34@@ -193,7 +200,11 @@
35
36 fun display_message_callback (prompt)
37 {
38-
39+
40+# Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n
41+if (prompt.SubString(0, 17) == "fsckd-cancel-msg:")
42+ prompt = prompt.SubString(17, strlen(prompt));
43+
44 prompt = Image.Text(prompt,1.0, 1.0, 1.0);
45 sprite_prompt.SetImage(prompt);
46 sprite_prompt.SetPosition(Window.GetX() + (Window.GetWidth() - prompt.GetWidth()) / 2, Window.GetY() + Window.GetHeight() * 0.93, 2);

Subscribers

People subscribed via source and target branches

to all changes: