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

[Simon Quigley]

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

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.

[Steve Langasek (vorlon)]

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

review: Approve

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