Merge ~vorlon/ubiquity:lp.1768230/cosmic into ubiquity:master

[Steve Langasek]

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ec15591..4c51e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubiquity (18.10.4) UNRELEASED; urgency=medium
+
+  * scripts/plugininstall.py: don't hard-code a resume partition in
+    /etc/initramfs-tools/conf.d/resume at install time.  In bionic and later,
+    initramfs-tools will autodetect an appropriate resume partition at
+    initramfs generation time, so ubiquity's resume setting is redundant and
+    possibly wrong.  LP: #1768230.
+
+ -- Steve Langasek <[e-mail]>  Thu, 14 Jun 2018 23:01:01 -0700
+
 ubiquity (18.10.3) cosmic; urgency=medium
 
   [ Didier Roche ]
diff --git a/scripts/plugininstall.py b/scripts/plugininstall.py
index 70c3aa9..3e171c3 100755
--- a/scripts/plugininstall.py
+++ b/scripts/plugininstall.py
@@ -758,27 +758,6 @@ class Install(install_misc.InstallBase):
         self.db.progress('SET', 5)
         self.db.progress('STOP')
 
-    def get_resume_partition(self):
-        biggest_size = 0
-        biggest_partition = None
-        try:
-            with open('/proc/swaps') as swaps:
-                for line in swaps:
-                    words = line.split()
-                    if words[1] != 'partition':
-                        continue
-                    if not os.path.exists(words[0]):
-                        continue
-                    if words[0].startswith('/dev/zram'):
-                        continue
-                    size = int(words[2])
-                    if size > biggest_size:
-                        biggest_size = size
-                        biggest_partition = words[0]
-        except Exception:
-            return None
-        return biggest_partition
-
     def configure_hardware(self):
         """Reconfigure several hardware-specific packages.
 
@@ -806,29 +785,6 @@ class Install(install_misc.InstallBase):
             script += '-oem'
         misc.execute(script)
 
-        resume = self.get_resume_partition()
-        if resume is not None:
-            resume_uuid = None
-            try:
-                resume_uuid = subprocess.Popen(
-                    ['block-attr', '--uuid', resume],
-                    stdout=subprocess.PIPE,
-                    universal_newlines=True).communicate()[0].rstrip('\n')
-            except OSError:
-                pass
-            if resume_uuid:
-                resume = "UUID=%s" % resume_uuid
-            if os.path.exists(self.target_file('etc/initramfs-tools/conf.d')):
-                configdir = self.target_file('etc/initramfs-tools/conf.d')
-            elif os.path.exists(self.target_file('etc/mkinitramfs/conf.d')):
-                configdir = self.target_file('etc/mkinitramfs/conf.d')
-            else:
-                configdir = None
-            if configdir is not None:
-                resume_path = os.path.join(configdir, 'resume')
-                with open(resume_path, 'w') as configfile:
-                    print("RESUME=%s" % resume, file=configfile)
-
         osextras.unlink_force(self.target_file('etc/popularity-contest.conf'))
         try:
             participate = self.db.get('popularity-contest/participate')