From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH v2 4/6] host/start-vm: boot using partition label
Date: Sun, 9 Oct 2022 11:40:34 +0000 [thread overview]
Message-ID: <20221009114036.463071-5-hi@alyssa.is> (raw)
In-Reply-To: <20221009114036.463071-1-hi@alyssa.is>
This will allow booting reliably from multiple disk images, without
relying on order.
Thanks-to: Puck Meerburg <puck@puckipedia.com>
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
host/start-vm/lib.rs | 2 +-
host/start-vm/tests/vm_command-basic.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/host/start-vm/lib.rs b/host/start-vm/lib.rs
index 5d43a3e..ef79091 100644
--- a/host/start-vm/lib.rs
+++ b/host/start-vm/lib.rs
@@ -43,7 +43,7 @@ pub fn vm_command(dir: PathBuf, config_root: &Path) -> Result<Command, String> {
command.args(&["-dc", "test -S env/cloud-hypervisor.sock"]);
command.arg("cloud-hypervisor");
command.args(&["--api-socket", "env/cloud-hypervisor.sock"]);
- command.args(&["--cmdline", "console=ttyS0 root=/dev/vda"]);
+ command.args(&["--cmdline", "console=ttyS0 root=PARTLABEL=root"]);
command.args(&["--memory", "size=128M"]);
command.args(&["--console", "pty"]);
command.arg("--kernel");
diff --git a/host/start-vm/tests/vm_command-basic.rs b/host/start-vm/tests/vm_command-basic.rs
index a577a71..b9585f9 100644
--- a/host/start-vm/tests/vm_command-basic.rs
+++ b/host/start-vm/tests/vm_command-basic.rs
@@ -35,7 +35,7 @@ fn main() -> std::io::Result<()> {
OsStr::new("--api-socket"),
OsStr::new("env/cloud-hypervisor.sock"),
OsStr::new("--cmdline"),
- OsStr::new("console=ttyS0 root=/dev/vda"),
+ OsStr::new("console=ttyS0 root=PARTLABEL=root"),
OsStr::new("--memory"),
OsStr::new("size=128M"),
OsStr::new("--console"),
--
2.37.1
next prev parent reply other threads:[~2022-10-09 11:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-09 11:40 [PATCH v2 0/6] Introduce a shared base for application VMs Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 1/6] host/start-vm: support multiple block devices Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 2/6] scripts/make-gpt.sh: add support for labels Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 3/6] vm: build GPT images Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` Alyssa Ross [this message]
2022-11-14 1:14 ` [PATCH v2 4/6] host/start-vm: boot using partition label Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 5/6] release: rename from "img" Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 6/6] img/app: extract from appvm-{lynx,catgirl} Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-10 23:28 [PATCH 00/22] Implement managing VMs with Nix Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 4/6] host/start-vm: boot using partition label Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221009114036.463071-5-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).