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,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 B761786BCB; Sun, 9 Oct 2022 11:41:11 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 3527A86AD7; Sun, 9 Oct 2022 11:41:06 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by atuin.qyliss.net (Postfix) with ESMTPS id 1F8B886ACE for ; Sun, 9 Oct 2022 11:41:00 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 235F932001E9 for ; Sun, 9 Oct 2022 07:40:58 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 09 Oct 2022 07:40:58 -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=1665315657; x=1665402057; bh=zP I6kh1RSzcXq+rKEEWd+9wlpwhlePvuqX8fu7knrVY=; b=asCtM0CAOXjOc/cCij 3wifDzqf567qF3qiyopSMwhq1kgqXVqU6nrV8usBsmADsWPyYrMXNBM2v5aV04ol B1ADRSwMhIeaxNI/sXcC5JoaPAGdiabmJrBjEFRQaeHNcL8t1YqCdFQxF03FXDgM FZXDV0o2nIW8TI30/swyF4q3a37+jjvXwRqTFqZE9xp/SMxtQmqzDPTldHXguJGl pK/qOlE/PPLV3Es5X2Nj+LIGG2iUN43l76J9vzQlTsXJqyrFLt/3t06iSDhpwrmV Zt7WYZVMnBY29uyfGBq1nyM72EdCQVlD8KjCuyy/mJTHzCow/VQhKGw0Z8L64wcp UoiQ== 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=1665315657; x=1665402057; bh=zPI6kh1RSzcXq +rKEEWd+9wlpwhlePvuqX8fu7knrVY=; b=QnfnD7p1Pzp8/TsOhjcuMEQ7n5/Gg wEwVd+EC1H5DMzUli3fYWgDtBmTVk1S78K7ttuHdd2MwH+d0FnImemIsGINdfwt3 MJUqR7bt8oFnyZomPfE6xmyLPkfQ6MxQD61CKGfDrKlsYNI3TiK6MdG+C4wrAFAk VlFfRgwSOUzmkuxWH2qLW1qszu8UrhNZpuMiNB/Wwi4lwbUFW6M3A4P5lbKeGspR nbpQWfHXbDetONfDuCfhZcK5qRQNMIQ5qDkZkixh4SD1M6CDR+MDicA3sxqju14Z PQQOBykEjXnntqBuYFHx20t+fRxwlFSjEsRbX4OmNoqumDEpaa990kYhQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejuddggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 9 Oct 2022 07:40:57 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id E8E86473; Sun, 9 Oct 2022 11:40:55 +0000 (UTC) From: Alyssa Ross 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 Message-Id: <20221009114036.463071-5-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221009114036.463071-1-hi@alyssa.is> References: <20221009114036.463071-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: HS4ZBICCGP27S2PITGTMVOCIAQIDUKBJ X-Message-ID-Hash: HS4ZBICCGP27S2PITGTMVOCIAQIDUKBJ 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