fixup! feat(arm,bootloader,efi): use separate BLS directory for upgrades

oamg · Jan 22, 2025 · ee31e04 · ee31e04
1 parent 5076c9f
commit ee31e04
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py b/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py
@@ -423,6 +423,11 @@ def modify_our_grubenv_to_have_separate_blsdir(efi_info):
         raise StopActorExecutionError('Failed to set up bootloader for the upgrade.')
 
     # The 'blsdir' grubenv variable specifies location of bls directory relative to /boot
+    if os.path.exists(efi_info.upgrade_bls_dir):
+        msg = 'The {} directory exists, probably a left-over from previous executions. Removing.'
+        api.current_logger().debug(msg.format(efi_info.upgrade_bls_dir))
+        shutil.rmtree(efi_info.upgrade_bls_dir)
+
     os.makedirs(efi_info.upgrade_bls_dir)
     api.current_logger().debug('Successfully created upgrade BLS directory: {}'.format(efi_info.upgrade_bls_dir))