summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-09-09 14:32:44 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2019-09-11 15:48:06 +0200
commit7243d9ff8c033cf211d2fa81b7609b0ff9d9bf3f (patch)
treebfd14c96095fad43295f2fb834d4e5e9e9a68a2d
parentcfa1b1cd6e00bdac6bc15718e7e9f285c731834a (diff)
downloadmeta-updater-7243d9ff8c033cf211d2fa81b7609b0ff9d9bf3f.tar.gz
Print usage information after parameter checking.
No use printing all that if there's a problem anyway. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rwxr-xr-xscripts/run-qemu-ota12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota
index 3312fd3..232ee11 100755
--- a/scripts/run-qemu-ota
+++ b/scripts/run-qemu-ota
@@ -55,12 +55,6 @@ def main():
55 print(e.message) 55 print(e.message)
56 sys.exit(1) 56 sys.exit(1)
57 57
58 print("Launching %s with mac address %s" % (args.imagename, qemu_command.mac_address))
59 print("To connect via SSH:")
60 print(" ssh -o StrictHostKeyChecking=no root@localhost -p %d" % qemu_command.ssh_port)
61 print("To connect to the serial console:")
62 print(" nc localhost %d" % qemu_command.serial_port)
63
64 cmdline = qemu_command.command_line() 58 cmdline = qemu_command.command_line()
65 if args.overlay and not exists(args.overlay): 59 if args.overlay and not exists(args.overlay):
66 print("Overlay file %s does not yet exist, creating." % args.overlay) 60 print("Overlay file %s does not yet exist, creating." % args.overlay)
@@ -70,6 +64,12 @@ def main():
70 else: 64 else:
71 Popen(img_cmdline).wait() 65 Popen(img_cmdline).wait()
72 66
67 print("Launching %s with mac address %s" % (args.imagename, qemu_command.mac_address))
68 print("To connect via SSH:")
69 print(" ssh -o StrictHostKeyChecking=no root@localhost -p %d" % qemu_command.ssh_port)
70 print("To connect to the serial console:")
71 print(" nc localhost %d" % qemu_command.serial_port)
72
73 if args.dry_run: 73 if args.dry_run:
74 print(" ".join(cmdline)) 74 print(" ".join(cmdline))
75 else: 75 else: