[Pkg-privacy-commits] [tails-installer] 66/70: For isohybrids, skip partitions so we install to the block device.
Ulrike Uhlig
ulrike at moszumanska.debian.org
Mon Nov 20 14:55:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.
commit b7dcb936a58bb0016981645c9224caee4493112a
Author: anonym <anonym at riseup.net>
Date: Wed Sep 20 15:42:32 2017 +0200
For isohybrids, skip partitions so we install to the block device.
Trying to install to a partition on isohybrids results in:
GDBus.Error:org.freedesktop.UDisks2.Error.NotSupported: This
partition cannot be modified because it contains a partition
table; please reinitialize layout of the whole device.
---
tails_installer/creator.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 6b23249..60a8ce8 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -703,7 +703,11 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
continue
self.drives[data['device']] = data
else:
- self.drives[data['device']] = data
+ if self.device_is_isohybrid(data):
+ if data['parent']:
+ # We will target the parent instead
+ continue
+ self.drives[data['device']] = data
# Remove parent drives if a valid partition exists
if not self.force_reinstall:
@@ -950,6 +954,13 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
return self.is_partition_GPT(device) and device['fstype'] == 'vfat' \
and device['label'] == 'Tails'
+ def device_is_isohybrid(self, drive=None):
+ if not drive:
+ device = self.drive
+ else:
+ device = drive
+ return device['fstype'] == 'iso9660'
+
def save_full_drive(self):
self._full_drive = self.drives[self._drive]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list