qemu: Move prompt handling out of standard_boot()

Author: mpe

lib/pexpect_utils.py

@@ -6,8 +6,6 @@
 
 
 class PexpectHelper:
-    DEFAULT_PROMPT = "/ #"
-
     default_bug_patterns = [
         'Unable to handle kernel paging request',
         'Oops: Kernel access of bad area',
@@ -103,12 +101,7 @@ def cmd(self, cmd):
         self.expect_prompt()
 
 
-def standard_boot(p, login=False, user='root', password=None, timeout=-1, prompt=None):
-    if prompt is None:
-        prompt = p.DEFAULT_PROMPT
-
-    p.push_prompt(prompt)
-
+def standard_boot(p, login=False, user='root', password=None, timeout=-1):
     logging.info("Waiting for kernel to boot")
     p.expect("Freeing unused kernel ", timeout=timeout)
 

lib/qemu.py

@@ -149,6 +149,10 @@ def apply_defaults(self):
                 self.cmdline += 'root=/dev/vda2 '
                 self.prompt = 'root@debian:~#'
 
+        if self.prompt is None:
+            # Default prompt for our root disks
+            self.prompt = "/ #"
+
         if self.initrd is None and self.drive is None and self.cloud_image is None:
             if self.compat_rootfs or self.qemu_path.endswith('qemu-system-ppc'):
                 subarch = 'ppc'
@@ -368,7 +372,8 @@ def qemu_main(qconf):
     p = PexpectHelper()
     p.spawn(cmd, logfile=open(qconf.logpath, 'w'), timeout=pexpect_timeout, quiet=qconf.quiet)
 
-    standard_boot(p, qconf.login, qconf.user, qconf.password, boot_timeout, qconf.prompt)
+    p.push_prompt(qconf.prompt)
+    standard_boot(p, qconf.login, qconf.user, qconf.password, boot_timeout)
 
     p.send('echo "booted-revision: `uname -r`"')
     p.expect(f'booted-revision: {qconf.expected_release}')