Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Feature debug-shell (#1028)

Browse source 
* Changed usb-shell behavior, it wait for some user action before continue booting
* Rename usb-shell to debug-shell and changed port to 23
* Add `20-debug-shell.sh` script to static code analysis
* Enable eth0 interface in initramfs (qemu)
* Add additional script to run a shell in order to be able to kill it from a telnet session
This commit is contained in:
drebrez 2017-12-23 20:22:28 +01:00 • committed by Oliver Smith
parent 62180dd827
commit c0c197f57b
11 changed files with 90 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pmb/qemu/run.py
View file

@ -109,7 +109,7 @@ def command_qemu(args, arch, device, img_path, spice_enabled):
logging.debug("Kernel cmdline: " + cmdline)
port_ssh = str(args.port)
port_telnet = str(args.port + 2)
port_telnet = str(args.port + 1)
suffix = "rootfs_" + device
rootfs = args.work + "/chroot_" + suffix
@ -122,7 +122,7 @@ def command_qemu(args, arch, device, img_path, spice_enabled):
command += ["-netdev",
"user,id=net0,"
"hostfwd=tcp::" + port_ssh + "-:22,"
"hostfwd=tcp::" + port_telnet + "-:24"
"hostfwd=tcp::" + port_telnet + "-:23"
",net=172.16.42.0/24,dhcpstart=" + pmb.config.default_ip
]
command += ["-show-cursor"]
@ -249,9 +249,9 @@ def run(args):
# SSH/telnet hints
logging.info("Connect to the VM (telnet requires 'pmbootstrap initfs"
" hook_add usb-shell'):")
" hook_add debug-shell'):")
logging.info("* (ssh) ssh -p {port} {user}@localhost".format(**vars(args)))
logging.info("* (telnet) telnet localhost " + str(args.port + 2))
logging.info("* (telnet) telnet localhost " + str(args.port + 1))
# Run Qemu (or Qemu + SPICE)
process = None