From 053e41f4e53b590654f7cece5f84fdfd9dd20bf2 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Wed, 27 Sep 2023 16:07:54 -0700 Subject: [PATCH] docs(tvix/boot): Update command to reflect new tvix/boot directory This used to be in tvix/test but was moved to tvix/boot, but not all the command were updated so they no longer work as documented. This updates the commands to use the new tvix/boot directory. Change-Id: I8658d928a152140df182c159bf98ea9d9ecd1302 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9482 Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/boot/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tvix/boot/README.md b/tvix/boot/README.md index 79fca31eb..cf593dcc0 100644 --- a/tvix/boot/README.md +++ b/tvix/boot/README.md @@ -5,7 +5,7 @@ virtiofs. In the `tests/` subdirectory, there's some integration tests. -## //tvix/tests:runVM +## //tvix/boot:runVM A script spinning up a `tvix-store virtiofs` daemon, then starting a cloud- hypervisor VM. @@ -52,7 +52,7 @@ pkill nar-bridge; pkill tvix-store Run the VM like this: ``` -CH_CMDLINE=tvix.shell mg run //tvix/tests:runVM -- +CH_CMDLINE=tvix.shell mg run //tvix/boot:runVM -- ``` You'll get dropped into an interactive shell, from which you can do things with @@ -81,7 +81,7 @@ Run the VM like this: ``` hello_cmd=$(mg build //third_party/nixpkgs:hello)/bin/hello -CH_CMDLINE=tvix.run=$hello_cmd mg run //tvix/tests:runVM -- +CH_CMDLINE=tvix.run=$hello_cmd mg run //tvix/boot:runVM -- ``` Observe it executing the file (and closure) from the tvix-store: @@ -106,7 +106,7 @@ init= cmdline option, and will switch_root to it. ``` -CH_CMDLINE=init=/nix/store/…-nixos-system-…/init mg run //tvix/tests:runVM -- +CH_CMDLINE=init=/nix/store/…-nixos-system-…/init mg run //tvix/boot:runVM -- ``` ``` @@ -133,4 +133,4 @@ starting systemd... [ 0.980740] systemd[1]: systemd 253.6 running in system mode (+PAM +AUDIT -SELINUX +APPARMOR +IMA +SMACK +SECCOMP +GCRYPT -GNUTLS +OPENSSL +ACL +BLKID +CURL +ELFUTILS +FIDO2 +IDN2 -IDN +IPTC +KMOD +LIBCRYPTSETUP +LIBFDISK +PCRE2 -PWQUALITY +P11KIT -QRENCODE +TPM2 +BZIP2 +LZ4 +XZ +ZLIB +ZSTD +BPF_FRAMEWORK -XKBCOMMON +UTMP -SYSVINIT default-hierarchy=unified) ``` -This effectively replaces the NixOS Stage 1 entirely. \ No newline at end of file +This effectively replaces the NixOS Stage 1 entirely.