2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Always ask GPT/MBR/Source when formatting a disk

Browse source 
* This fixes cloning partitions when not creating a boot partiton
This commit is contained in:
2Shirt 2020-01-03 17:32:51 -07:00
parent 6eaf5c2bc2
commit 097360ca0a
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/wk/hw/ddrescue.py
View file

@ -312,19 +312,19 @@ class State():
# New run, use new settings file # New run, use new settings file
settings['Needs Format'] = True settings['Needs Format'] = True
offset = 0 offset = 0
user_choice = std.choice(
['G', 'M', 'S'],
'Format clone using GPT, MBR, or match Source type?',
)
if user_choice == 'G':
settings['Table Type'] = 'GPT'
elif user_choice == 'M':
settings['Table Type'] = 'MBR'
else:
# Match source type
settings['Table Type'] = get_table_type(self.source)
if std.ask('Create an empty Windows boot partition on the clone?'): if std.ask('Create an empty Windows boot partition on the clone?'):
settings['Create Boot Partition'] = True settings['Create Boot Partition'] = True
user_choice = std.choice(
['G', 'M', 'S'],
'Use GPT, MBR, or match Source type?',
)
if user_choice == 'G':
settings['Table Type'] = 'GPT'
elif user_choice == 'M':
settings['Table Type'] = 'MBR'
else:
# Match source type
settings['Table Type'] = get_table_type(self.source)
offset = 2 if settings['Table Type'] == 'GPT' else 1 offset = 2 if settings['Table Type'] == 'GPT' else 1
# Add pairs # Add pairs
@ -1249,7 +1249,7 @@ def build_sfdisk_partition_line(table_type, dev_path, size, details):
dest_type = source_type.upper() dest_type = source_type.upper()
if not dest_type: if not dest_type:
# Assuming changing table types, set based on FS # Assuming changing table types, set based on FS
if source_filesystem in cfg.ddrescue.PARTITION_TYPES[table_type]: if source_filesystem in cfg.ddrescue.PARTITION_TYPES.get(table_type, {}):
dest_type = cfg.ddrescue.PARTITION_TYPES[table_type][source_filesystem] dest_type = cfg.ddrescue.PARTITION_TYPES[table_type][source_filesystem]
line += f', type={dest_type}' line += f', type={dest_type}'