From 06742ed59092530aedf03f65c3c9542c24ff7ac3 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 13 Jun 2017 18:39:09 +0300 Subject: runqemu: change terminal settings for valid tty's runqemu uses stty to change terminal settings to give users better control to qemu. However, stty does not work when runqemu is run directly or indirectly via oe-selftest in a Docker container (presumably some problems with Docker's pseudo-tty implementation). The error reported is: stty: 'standard input': Inappropriate ioctl for device As runqemu recently moved to subprocess.check_call() for stty calls we now get thrown an error and all runqemu runs fail. sys.stdin.isatty() does proper job in detecting if the stty calls can work so we use that check before running the stty subprocess operations. Signed-off-by: Mikko Ylinen Signed-off-by: Richard Purdie --- scripts/runqemu | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 311fbebdf4..26328e5b51 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -955,8 +955,8 @@ class BaseConfig(object): def setup_network(self): if self.get('QB_NET') == 'none': return - cmd = "stty -g" - self.saved_stty = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') + if sys.stdin.isatty(): + self.saved_stty = subprocess.check_output("stty -g", shell=True).decode('utf-8') self.network_device = self.get('QB_NETWORK_DEVICE') or self.network_device if self.slirp_enabled: self.setup_slirp() @@ -1096,9 +1096,9 @@ class BaseConfig(object): self.qemu_opt += " -snapshot" if self.serialstdio: - logger.info("Interrupt character is '^]'") - cmd = "stty intr ^]" - subprocess.check_call(cmd, shell=True) + if sys.stdin.isatty(): + subprocess.check_call("stty intr ^]", shell=True) + logger.info("Interrupt character is '^]'") first_serial = "" if not re.search("-nographic", self.qemu_opt): -- cgit 1.2.3-korg