[Pkg-privacy-commits] [tails-installer] 05/12: Drop obsolete code that breaks UEFI boot on sticks installed with recent Debian testing/sid (refs: #14809).

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_5.0.2
in repository tails-installer.

commit bf716f0b2911cdbad8caee6706ac89cfe7fa07d0
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Oct 7 15:21:46 2017 +0000

    Drop obsolete code that breaks UEFI boot on sticks installed with recent Debian testing/sid (refs: #14809).
    
    By now all existing Tails system partitions should have been converted
    to ESP.
    
    This avoids calling _set_partition_flags, which resets the type of the partition
    with udisks2 2.7.3-4.
---
 tails_installer/creator.py | 17 -----------------
 tails_installer/gui.py     |  2 --
 2 files changed, 19 deletions(-)

diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 60a8ce8..0188e2c 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -226,12 +226,6 @@ class TailsInstallerCreator(object):
         """ Partition device listed at self.drive """
         raise NotImplementedError
 
-    def update_system_partition_properties(self):
-        cmd = (  [ '/sbin/sgdisk' ]
-               + [ '--typecode=1:%s' % ESP_GUID ]
-               + [ self.drive['parent'] ])
-        self.popen(cmd, shell=False)
-
     def system_partition_size(self, device_size_in_bytes):
         """ Return the optimal system partition size (in bytes) for
         a device_size_in_bytes bytes large destination device: 4 GiB on devices
@@ -916,17 +910,6 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
         # _set_drive, that fails with "Cannot find device /dev/sda1".
         self.rescan_block_device(self._get_object().props.block)
 
-    def update_system_partition_properties(self):
-        self.log.info(_('Updating properties of system partition %(system_partition)s') % {
-            'system_partition': self.drive['device']
-        })
-
-        system_partition = self._get_object().props.partition
-        system_partition.call_set_type_sync(ESP_GUID, GLib.Variant('a{sv}', None))
-        system_partition.call_set_name_sync(self.label, GLib.Variant('a{sv}', None))
-
-        self._set_partition_flags(system_partition, SYSTEM_PARTITION_FLAGS)
-
     def is_partition_GPT(self, drive=None):
         # Check if the partition scheme is GPT
         if drive:
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index df918c3..0f199fc 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -232,8 +232,6 @@ class TailsInstallerThread(threading.Thread):
             self.live.create_persistent_overlay()
             self.live.update_configs()
 
-            if not self.parent.opts.partition and self.live.is_partition_GPT():
-                self.live.update_system_partition_properties()
             self.live.install_bootloader()
             # self.live.bootable_partition()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git