Merge pull request #160 from rmartin013/riverside

Riverside: Workaround PDU issue LP#2039983
canonical · Nov 14, 2023 · 5093a85 · 5093a85
2 parents 55e9662 + a99048f
commit 5093a85
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/device-connectors/src/testflinger_device_connectors/devices/muxpi/muxpi.py b/device-connectors/src/testflinger_device_connectors/devices/muxpi/muxpi.py
@@ -322,6 +322,20 @@ def create_user(self, image_type):
                 )
                 cmd = f"sudo cp {remote_tmp}/user-data {ci_path}"
                 self._run_control(cmd)
+
+                # Set grub timeouts to 0 to workaround reboot getting stuck
+                # if spurious input is received on serial
+                cmd = (
+                    "sudo sed -i 's/timeout=[0-9]*/timeout=0/g' "
+                    f"{base}/boot/grub/grub.cfg"
+                )
+                self._run_control(cmd)
+                cmd = (
+                    f"grep -rl 'GRUB_TIMEOUT=' {base}/etc/default/ | xargs "
+                    "sudo sed -i 's/GRUB_TIMEOUT=[0-9]*/GRUB_TIMEOUT=0/g'"
+                )
+                self._run_control(cmd)
+
                 self._configure_sudo()
                 return
             if image_type == "pi-desktop":