summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2018-05-08 00:29:12 +0200
committerbertagaz <bertagaz@ptitcanardnoir.org>2018-05-08 00:29:12 +0200
commitd96004b430aa7c136e64b550a66c9103d0064677 (patch)
treea81d57727dd01a146ddea284a547a4c6ff3d3207
parentab68a6ba8e8f80eb96cec84946216f3c749a843c (diff)
Revert "Import Tails Installer branch bugfix/15432-installer-robustness as a patch (refs: #15432)"
This reverts commit 10a7927efad4fe57e099ef9af3b08efbbe31c2ec.
-rw-r--r--config/chroot_local-patches/installer-bug15432.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/config/chroot_local-patches/installer-bug15432.patch b/config/chroot_local-patches/installer-bug15432.patch
deleted file mode 100644
index 57a1e4e..0000000
--- a/config/chroot_local-patches/installer-bug15432.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/usr/lib/python2.7/dist-packages/tails_installer/creator.py b/usr/lib/python2.7/dist-packages/tails_installer/creator.py
-index ff47356..2a949ae 100755
---- a/usr/lib/python2.7/dist-packages/tails_installer/creator.py
-+++ b/usr/lib/python2.7/dist-packages/tails_installer/creator.py
-@@ -899,12 +899,6 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
- else:
- raise
-
-- # Rescan the device as it seems this is not always done automatically.
-- # And get the new object after the rescan, then its 1st partition
-- # which is the one we just created on our new partition table.
-- self.rescan_block_device(self._get_object().props.block)
-- system_partition = self.first_partition(self.drive['udi'])
--
- # Get a fresh system_partition object, otherwise
- # _set_partition_flags sometimes fails with
- # "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No
-@@ -918,6 +912,14 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
- # XXX: sometimes fails (https://labs.riseup.net/code/issues/10987)
- self._set_partition_flags(system_partition, SYSTEM_PARTITION_FLAGS)
-
-+ # Get a fresh system_partition object, otherwise
-+ # call_set_flags_sync sometimes fails with "No such interface
-+ # 'org.freedesktop.UDisks2.Partition' on object at path
-+ # /org/freedesktop/UDisks2/block_devices/sdd1"
-+ # (https://labs.riseup.net/code/issues/15432)
-+ self.rescan_block_device(self._get_object().props.block)
-+ system_partition = self.first_partition(self.drive['udi'])
-+
- # _set_partition_flags resets the partition type with udisks2 2.7.3-4,
- # so let's set the right one again
- # XXX: sometimes fails (https://labs.riseup.net/code/issues/10987)