Add UI process that controls which entry gets booted

.gitignore

@@ -1,5 +1,6 @@
-*.qcow2
 *.iso
+*.qcow2
 .direnv
+out
 result*
 target

Makefile

@@ -0,0 +1,43 @@
+# TODO(jared): DON'T USE THIS, it is just an experimental way to have a quicker
+# feedback loop while developing and is not done
+# things to do to get this working:
+# - nix shell with static musl toolchain so the CPIO does not need any shared libraries
+# - nix derivations of the kernel, base initrd w/busybox utils, and base coreboot ROM
+
+src := $(shell git ls-files --directory tinyboot)
+
+.PHONY := default run clean
+
+default: run
+
+run: out/tinyboot-coreboot.rom
+	# bash test/test.bash out/tinyboot-coreboot.rom
+	echo run!
+
+clean:
+	rm -rf out
+
+out/tinyboot-coreboot.rom: $(src) out out/initrd out/kernel out/tinyboot.cpio out/coreboot.rom
+	echo concatentate tinyboot cpio to out/initrd
+	echo use cbfs to create out/tinyboot-coreboot.rom
+
+out/tinyboot.cpio: out/bin
+	cargo build --manifest-path tinyboot/Cargo.toml
+	cd out && find ./bin | cpio -ov > tinyboot.cpio
+
+out/bin:
+	cargo build --manifest-path tinyboot/Cargo.toml
+	mkdir -p out/bin
+	cp tinyboot/target/debug/{tbootd,tbootui,tbootctl} out/bin/
+
+out/coreboot.rom:
+	dd if=$(shell nix build --no-link --print-out-paths -L .\#coreboot.qemu-x86_64)/coreboot.rom of=out/coreboot.rom
+
+out/initrd:
+	echo initrd
+
+out/kernel:
+	echo kernel
+
+out:
+	mkdir -p out

README.md

@@ -1,21 +1,21 @@
 # tinyboot
 
-tinyboot is a linuxboot-like kexec bootloader for coreboot. Current boot
-configuration support includes grub, syslinux/extlinux, and
-[bls](https://uapi-group.org/specifications/specs/boot_loader_specification/).
-The nix flake provides coreboot builds for a few boards, contributions for more
-configs are welcome!
+Tinyboot is a linuxboot kexec bootloader for coreboot. Current boot
+configuration support includes
+[bls](https://uapi-group.org/specifications/specs/boot_loader_specification/),
+grub, and syslinux/extlinux. The nix flake provides coreboot builds for a few
+boards, contributions for more configs are welcome!
 
 ## Usage
 
-```bash
+```
 nix build github:jmbaur/tinyboot#coreboot.<your_board>
 flashrom -w ./result/coreboot.rom -p <your_programmer>
 ```
 
 ## Hacking
 
-```bash
+```
 nix run .#disk
 nix run .#default
 ```

TODO.md

@@ -1,9 +1,7 @@
 - provide a way to edit kernel cmdline
-- don't allow clippy::new_ret_no_self lints
-- way better UI
+- better UI
+- respond to SIGWINCH in tbootui
 - better bootloader interface
-- make the program smarter about printing to all known outputs, not just a
-  statically configured output
 - don't call oneshot `mdev -s` when tinyboot is not being ran explicitly on a
   tty
 - when verified boot fails, hash the boot files and ask the user explicitly for

boards/default.nix

@@ -50,9 +50,9 @@ let
           default = "/dev/null";
         };
       };
-      tty = lib.mkOption {
-        type = lib.types.str;
-        default = "tty0";
+      ttys = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ "tty0" ];
       };
       extraInit = lib.mkOption {
         type = lib.types.lines;
@@ -77,7 +77,7 @@ lib.mapAttrs
         meta = { inherit (finalConfig.config) platforms; };
       };
       linux = pkgs.callPackage ../kernel.nix { inherit (finalConfig.config.kernel) basePackage configFile; };
-      initrd = pkgs.callPackage ../initramfs.nix { inherit (finalConfig.config.tinyboot) measuredBoot verifiedBoot debug tty extraInit extraInittab; };
+      initrd = pkgs.callPackage ../initramfs.nix { inherit (finalConfig.config.tinyboot) measuredBoot verifiedBoot debug ttys extraInit extraInittab; };
       fitImage = buildFitImage { inherit board linux initrd; inherit (finalConfig.config.kernel) dtb dtbPattern; };
     in
     (buildPackages.runCommand "tinyboot-${coreboot.name}"

boards/qemu-aarch64/config.nix

@@ -9,7 +9,7 @@
   coreboot.configFile = lib.mkDefault ./coreboot.config;
   tinyboot = {
     debug = lib.mkDefault true;
-    tty = lib.mkDefault "ttyAMA0";
+    ttys = lib.mkDefault [ "ttyAMA0" ];
     verifiedBoot = {
       enable = lib.mkDefault true;
       publicKey = lib.mkDefault ../../test/keys/pubkey;

boards/qemu-kernel.config

@@ -1,4 +1,6 @@
 CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_DRM=y
+CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_I2C_VIRTIO=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_SCSI_VIRTIO=y

boards/qemu-x86_64/config.nix

@@ -4,7 +4,7 @@
   kernel.configFile = lib.mkDefault (pkgs.concatText "qemu-x86_64-kernel.config" [ ../generic-kernel.config ../qemu-kernel.config ../x86_64-kernel.config ./kernel.config ]);
   tinyboot = {
     debug = lib.mkDefault true;
-    tty = lib.mkDefault "ttyS0";
+    ttys = lib.mkDefault [ "tty0" "ttyS0" ];
     verifiedBoot = {
       enable = lib.mkDefault true;
       publicKey = lib.mkDefault ../../test/keys/pubkey;

boards/x86_64-kernel.config

@@ -5,6 +5,8 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PNP=y
 CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_RETPOLINE=y
+CONFIG_SPECULATION_MITIGATIONS=y
 CONFIG_SPI_DESIGNWARE=y
 CONFIG_SPI_INTEL=y
 CONFIG_SPI_INTEL_PCI=y

initramfs.nix

@@ -1,7 +1,7 @@
 { debug
+, ttys
 , measuredBoot
 , verifiedBoot
-, tty
 , extraInit
 , extraInittab
 , lib
@@ -32,25 +32,24 @@ let
     mount -t tmpfs tmpfs /tmp
     mount -t devpts devpts /dev/pts
     mdev -s
-    mkdir -p /home/tinyuser
-    chown -R tinyuser:tinyuser /home/tinyuser
+    mkdir -p /home/tinyuser /tmp/tinyboot
+    chown -R tinyuser:tinygroup /home/tinyuser /tmp/tinyboot
   '' + extraInit);
   inittab = writeText "inittab" (''
     ::sysinit:/etc/init.d/rcS
     ::ctrlaltdel:/bin/reboot
     ::shutdown:/bin/umount -ar -t ext4,vfat
     ::restart:/init
     ::respawn:/bin/mdev -df
-    ${tty}::respawn:/bin/tbootd --log-level=${if debug then "debug" else "info"}
-    ${tty}::respawn:/bin/tbootui
-  '' + extraInittab);
+    ::respawn:/bin/tbootd --log-level=${if debug then "debug" else "info"}
+  '' + (lib.concatLines (map (tty: "${tty}::respawn:/bin/tbootui") ttys)) + extraInittab);
   passwd = writeText "passwd" ''
     root:x:0:0:System administrator:/root:/bin/sh
     tinyuser:x:1000:1000:TinyUser:/home/tinyuser:/bin/sh
   '';
   group = writeText "passwd" ''
     root:x:0:
-    tinyuser:x:1000:
+    tinygroup:x:1000:
   '';
   mdevConf = writeText "mdev.conf" ''
     ([vs]d[a-z])             root:root  660  >disk/%1/0

test/module.nix

@@ -7,7 +7,7 @@
   environment.systemPackages = [ pkgs.tinyboot-client ];
   specialisation.alternate.configuration.boot.kernelParams = [ "console=tty0" ]; # to provide more menu options
   boot.growPartition = true;
-  boot.loader.timeout = lib.mkDefault 5;
+  boot.loader.timeout = lib.mkDefault 15;
   boot.loader.efi.canTouchEfiVariables = false;
   users.users.root.password = "";
   fileSystems."/boot" = {

test/test.bash

@@ -27,11 +27,11 @@ fi
 # -device tpm-tis,tpmdev=tpm0 \
 
 @qemu@ @qemuFlags@ \
-	-no-reboot \
-	-nographic \
 	-smp 2 \
 	-m 2G \
 	-bios @corebootROM@/coreboot.rom \
+	-device virtio-vga \
+	-serial stdio \
 	-device nec-usb-xhci,id=xhci \
 	-device usb-storage,bus=xhci.0,drive=stick,removable=true \
 	-drive if=none,id=stick,format=raw,file=nixos-@system@.iso \