From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id CFD6A9071A; Mon, 10 Oct 2022 23:33:16 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id A2B6690361; Mon, 10 Oct 2022 23:32:43 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 11AA5900D2 for ; Mon, 10 Oct 2022 23:32:14 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8F5695C01C6 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1665444730; x=1665531130; bh=zP I6kh1RSzcXq+rKEEWd+9wlpwhlePvuqX8fu7knrVY=; b=mt38CpIGd0EjaAna0Z nz9vN912oZnbS74iDeKVoxeoPyQt9ulV/+iGVDtbjpfR2Zf4FcKQN3ld20L9upN4 Kye7chc6MJ/7IjRcvqLS8lYeoqklj0LPa2MtSa52274URipN2xKq8uj0loOPCStR fquZurxWMGQ1k7iVTyMh6gCs48m2F1a8pTlSrJEjj+5ojFVou/T4r+fgD/3flmVS GTU16usSPmipVe5BltwbtYrnq/QU0E4GVtfBrm+Z/q3sc8/fNM51sfVgC/t8rGkk IrUtOO6kJfyUceZ+XYZAcjeqteBxj+Jj6LoW8BGjDhjn9XUEiGO/ghKToA9/QH/k 5VBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1665444730; x=1665531130; bh=zPI6kh1RSzcXq +rKEEWd+9wlpwhlePvuqX8fu7knrVY=; b=hJVfx4hMYo/+Ya7PAHoSq9W4Tq2DW JmE8fLFE0UnhKXj5omQ2p+mUQzfS4aPSXgEQPrVtOONeFGnWjuZgAf15coONnHcq lyLWi2ZLawAg95uGP9JnujJBRhZsYF1UrM+PrQ+o6t9jM6Nu0IL/rxmD4uq5+Db7 coHvmhxBjSVDcDC6Q8yhnGMvyD7Yib+xo0Lgb4bydCgd4fSvBoppQCvk7/irAMJg 6Dzqun8+8cdWVWHCBtS3epFsOd1tIGPFY6fusblIBnNFyNr5mBRXGzsktnnwvbcK W3418Cgw2vMqrk9R6IxyplkAFyLjSk20m6TpxLfkw+lSMjxrR2kPKuamA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id B76C0BCB; Mon, 10 Oct 2022 23:32:07 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v2 4/6] host/start-vm: boot using partition label Date: Mon, 10 Oct 2022 23:29:07 +0000 Message-Id: <20221010232909.1953738-28-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: LOULINSHLD2HUTHCIJHLXQA6ROKZC5JP X-Message-ID-Hash: LOULINSHLD2HUTHCIJHLXQA6ROKZC5JP X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This will allow booting reliably from multiple disk images, without relying on order. Thanks-to: Puck Meerburg Signed-off-by: Alyssa Ross --- 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.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