boot-qemu.py: Do not make gdb imply interactive

Keep these two options separate now that QEMU in the foreground runs in
a separate method than QEMU in the background. Adjust the one location
where we want interactive and gdb to do the same thing.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Author: nathanchance

boot-qemu.py

@@ -284,7 +284,7 @@ def run(self):
             ]  # yapf: disable
 
         # Kernel options
-        if self.interactive:
+        if self.interactive or args.gdb:
             self.cmdline.append('rdinit=/bin/sh')
         if self.gdb:
             self.cmdline.append('nokaslr')
@@ -758,7 +758,7 @@ def parse_arguments():
     if args.smp:
         runner.smp = args.smp
 
-    runner.interactive = args.interactive or args.gdb
+    runner.interactive = args.interactive
     runner.timeout = args.timeout
 
     runner.run()