Merge lp:~tsimonq2/ubiquity/lp-1763611 into lp:ubiquity

Proposed by Simon Quigley
Status: Merged
Merged at revision: 6616
Proposed branch: lp:~tsimonq2/ubiquity/lp-1763611
Merge into: lp:ubiquity
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
scripts/plugininstall.py (+1/-1)
To merge this branch: bzr merge lp:~tsimonq2/ubiquity/lp-1763611
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Ubuntu Installer Team Pending
Review via email: mp+343742@code.launchpad.net

Commit message

Detect the proper name for zram in /proc/swaps (LP: #1763611).

Description of the change

The correct scheme for zram mounts are /dev/zram#; detect this correctly (instead of the old naming scheme).

Without this, Lubuntu Bionic boot times (after install) are drastically increased.

I have tested this with today's daily, and it works as expected.

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

The previous code is self-evidently wrong. Uploading the fix to the archive; installer team, please merge.

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 2018-04-19 11:06:23 +0000
3+++ debian/changelog 2018-04-20 21:50:17 +0000
4@@ -1,3 +1,9 @@
5+ubiquity (18.04.9) bionic; urgency=medium
6+
7+ * Detect the proper name for zram in /proc/swaps (LP: #1763611).
8+
9+ -- Simon Quigley <tsimonq2@ubuntu.com> Fri, 20 Apr 2018 16:10:29 -0500
10+
11 ubiquity (18.04.8) bionic; urgency=medium
12
13 * Automatic update of included source packages: console-setup
14
15=== modified file 'scripts/plugininstall.py'
16--- scripts/plugininstall.py 2018-02-26 13:30:27 +0000
17+++ scripts/plugininstall.py 2018-04-20 21:50:17 +0000
18@@ -769,7 +769,7 @@
19 continue
20 if not os.path.exists(words[0]):
21 continue
22- if words[0].startswith('/dev/ramzswap'):
23+ if words[0].startswith('/dev/zram'):
24 continue
25 size = int(words[2])
26 if size > biggest_size:

Subscribers

People subscribed via source and target branches

to status/vote changes: