From 750e500ebf6a81f8af9e498d546a628f10f37710 Mon Sep 17 00:00:00 2001
From: Halley de Souza <halleysouza@google.com>
Date: Mon, 18 Sep 2023 16:45:53 +0200
Subject: [PATCH] Patch for gce-rescue/issues/21

---
 gce_rescue/.DS_Store         | Bin 6148 -> 0 bytes
 gce_rescue/tasks/metadata.py |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 gce_rescue/.DS_Store

diff --git a/gce_rescue/.DS_Store b/gce_rescue/.DS_Store
deleted file mode 100644
index 1cb28b9d1ad40eb7ef2c9218f92b1ac366ad408f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!AiqG5S^(JT7ytMc@YAh1TFXnvDAZSKS0}9OE6k#Q_x$keu9@?`~`o`lfIc<
zWShpTNSO({Z+A0qcJ`I*c8Q4li`z4zE)lg+1fv~P4JPlUtXa#C2#+;JP9<IA>Cw}g
zw+)yAroewwK)&5rzuBA~Dg1t4E{kb4DyAcN$o6oK()&_Fi>N~xO~JVXYocF#jlqXC
zMobShra7J=7}An`qR#rPvG%}PP=TFAvKxYRk9<qzmrW5g(`At9ZbO8|x#<IQzX!|?
z&2*j&8H}6e;#V+E0>(b_lPqVb7g*gX`WbpT+LCQa&s5fwT_VPD5Mx^-$U5h%o~;Qy
z!<9ww6dh|3)i3<5+Q>!pE8yFt`4Qs21sR}gw($z!%oc0M4y`r?OaW8iM*-O%5){GI
zW93k{4pe#t07e*ALtFkV2q*EFdaNAc4U8QX=&0<k80_d6PrP61v2y6>#QyTZerEPJ
z6xP`hKT&t$)S=a;fGM!5z?SQF<@~?+{r<m7vYshm3T%`D91X4peJshJt!s;uvo=Aw
qK@k(b%ArzF`Qum{augq+sNr2A4PffAa)=R_{Si<ZtTF}uRDo}evzyES

diff --git a/gce_rescue/tasks/metadata.py b/gce_rescue/tasks/metadata.py
index e08dd0b..8ac1821 100644
--- a/gce_rescue/tasks/metadata.py
+++ b/gce_rescue/tasks/metadata.py
@@ -68,8 +68,11 @@ def restore_metadata_items(vm, remove_rescue_mode: bool = False) -> Dict:
     'items': vm.backup_items
   }
   _logger.info('Restoring original metadata...')
-  if not remove_rescue_mode and not wait_for_os_boot(vm):
-    raise Exception('Guest OS boot timeout.')
+
+  # gce-rescue/issues/21 - continue after wait period timed out
+  if not remove_rescue_mode:
+    wait_for_os_boot(vm)
+
   operation = vm.compute.instances().setMetadata(
     **vm.project_data,
     instance = vm.name,