diff -Nru ubiquity-18.04.14.10/debian/changelog ubiquity-18.04.14.11/debian/changelog --- ubiquity-18.04.14.10/debian/changelog 2019-01-15 10:38:30.000000000 +0000 +++ ubiquity-18.04.14.11/debian/changelog 2019-01-21 20:25:03.000000000 +0000 @@ -1,3 +1,14 @@ +ubiquity (18.04.14.11) bionic; urgency=medium + + [ Steve Langasek ] + * 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. + + -- Dimitri John Ledkov Mon, 21 Jan 2019 20:25:03 +0000 + ubiquity (18.04.14.10) bionic; urgency=medium * When installing non-free packages, also iterate and install any diff -Nru ubiquity-18.04.14.10/scripts/plugininstall.py ubiquity-18.04.14.11/scripts/plugininstall.py --- ubiquity-18.04.14.10/scripts/plugininstall.py 2019-01-15 10:34:04.000000000 +0000 +++ ubiquity-18.04.14.11/scripts/plugininstall.py 2019-01-21 20:18:08.000000000 +0000 @@ -759,27 +759,6 @@ 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. @@ -807,29 +786,6 @@ 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')