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

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
2Shirt 2023-08-26 17:40:26 -07:00
commit ce1a4ed723
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/wk/clone/ddrescue.py
View file

@ -257,8 +257,6 @@ def finalize_recovery(state: State, dry_run: bool = True) -> None:
return return
# Run functions # Run functions
if menu.options['Relocate Backup GPT']['Selected']:
relocate_backup_gpt(state, dry_run=dry_run)
if menu.options['Zero-fill Gaps']['Selected']: if menu.options['Zero-fill Gaps']['Selected']:
zero_fill_gaps( zero_fill_gaps(
state, state,
@ -266,6 +264,9 @@ def finalize_recovery(state: State, dry_run: bool = True) -> None:
dry_run=dry_run, dry_run=dry_run,
extend_to_end=menu.options['Zero-fill Extra Space']['Selected'], extend_to_end=menu.options['Zero-fill Extra Space']['Selected'],
) )
if menu.options['Relocate Backup GPT']['Selected']:
# NOTE: This needs to be run last to avoid corrupting/erasing the backup GPT
relocate_backup_gpt(state, dry_run=dry_run)
def is_missing_source_or_destination(state) -> bool: def is_missing_source_or_destination(state) -> bool:
@ -402,7 +403,6 @@ def relocate_backup_gpt(state: State, dry_run: bool = True) -> None:
and state.source.size < state.destination.size and state.source.size < state.destination.size
and not state.source.parent and not state.source.parent
and str(state.source.raw_details.get('pttype', 'Unknown')).lower() == 'gpt' and str(state.source.raw_details.get('pttype', 'Unknown')).lower() == 'gpt'
and cli.ask('Relocate backup GPT to the end of the device?')
): ):
LOG.warning('Refusing to attempt a backup GPT relocation.') LOG.warning('Refusing to attempt a backup GPT relocation.')
return return
@ -698,11 +698,13 @@ def zero_fill_gaps(
) -> None: ) -> None:
"""Zero-fill any gaps on the destination.""" """Zero-fill any gaps on the destination."""
#fake_settings_menu = menus.settings(state.mode) #fake_settings_menu = menus.settings(state.mode)
full_disk_clone = False full_disk_clone = bool(
state.mode == 'Clone'
and len(state.block_pairs) == 1
and not state.source.parent
)
larger_destination = state.source.size < dest_size larger_destination = state.source.size < dest_size
percent_recovered = state.get_percent_recovered() percent_recovered = state.get_percent_recovered()
if state.mode == 'Clone' and len(state.block_pairs) == 1:
full_disk_clone = True
# Bail early # Bail early
if percent_recovered == 100 and not (larger_destination and extend_to_end): if percent_recovered == 100 and not (larger_destination and extend_to_end):