diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-23 16:44:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-23 16:46:25 +0000 |
| commit | 914a749fb201030ad16c211aa3eacbd1de8139a1 (patch) | |
| tree | d6a5047eb5644e62f044894e0a7df6238a610a1c /host | |
| parent | 629ef97904798fc84f8782a760be92e2e820868c (diff) | |
| download | spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.tar spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.tar.gz spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.tar.bz2 spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.tar.lz spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.tar.xz spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.tar.zst spectrum-914a749fb201030ad16c211aa3eacbd1de8139a1.zip | |
host/rootfs: remove make console
The virtio-console device was removed in
45c0e9a ("etc/service/getty-hvc0: remove"), so it wouldn't have had
anything to connect to anyway.
Fixes: 45c0e9a ("etc/service/getty-hvc0: remove")
Diffstat (limited to 'host')
| -rw-r--r-- | host/rootfs/Makefile | 5 | ||||
| -rwxr-xr-x | host/rootfs/scripts/qemu-pty.sh | 12 | ||||
| -rw-r--r-- | host/rootfs/shell.nix | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index d78cc4c..54034ca 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -5,7 +5,6 @@ # Nixpkgs. If you don't have qemu-kvm, you'll need to set e.g. # QEMU_KVM = qemu-system-x86_64 -enable-kvm. QEMU_KVM = qemu-kvm -SCREEN = screen # tar2ext4 will leave half a filesystem behind if it's interrupted # half way through. @@ -131,7 +130,3 @@ run: build/rootfs.ext4 $(EXT_FS) -device virtio-vga-gl \ -device vhost-vsock-pci,guest-cid=3 .PHONY: run - -console: - @$(SCREEN) "$$(scripts/qemu-pty.sh vmm.sock virtiocon0)" -.PHONY: console diff --git a/host/rootfs/scripts/qemu-pty.sh b/host/rootfs/scripts/qemu-pty.sh deleted file mode 100755 index 2a27341..0000000 --- a/host/rootfs/scripts/qemu-pty.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -# SPDX-License-Identifier: EUPL-1.2 -# -# usage: qemu-pty.sh socket-path chardev-name - -nc -U "$1" <<IN | jq -rn --arg name "$2" 'first(inputs | .return | arrays)[] | - select(.label == $name) | .filename | ltrimstr("pty:")' -{"execute":"qmp_capabilities"} -{"execute":"query-chardev"} -IN diff --git a/host/rootfs/shell.nix b/host/rootfs/shell.nix index 6146337..3b2310f 100644 --- a/host/rootfs/shell.nix +++ b/host/rootfs/shell.nix @@ -10,7 +10,7 @@ with pkgs; { nativeBuildInputs = nativeBuildInputs ++ [ - jq netcat qemu_kvm reuse screen util-linux + jq netcat qemu_kvm reuse util-linux ]; EXT_FS = pkgsStatic.callPackage ../initramfs/extfs.nix { inherit pkgs; }; |