From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH v2 3/6] vm: build GPT images
Date: Mon, 10 Oct 2022 23:29:06 +0000 [thread overview]
Message-ID: <20221010232909.1953738-27-hi@alyssa.is> (raw)
In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is>
This will allow booting reliably from multiple disk images, without
relying on order or requiring udev in an initramfs. (The only
deterministic way of doing boot order on Linux without special
userspace support is to set "root" on the kernel command line to
either a GPT partition UUID or label.)
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
vm/app/catgirl/Makefile | 13 ++++++++++---
vm/app/catgirl/default.nix | 10 +++++++---
vm/app/lynx/Makefile | 13 ++++++++++---
vm/app/lynx/default.nix | 10 +++++++---
vm/sys/net/Makefile | 13 ++++++++++---
vm/sys/net/default.nix | 10 +++++++---
6 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/vm/app/catgirl/Makefile b/vm/app/catgirl/Makefile
index 9016745..8129c8e 100644
--- a/vm/app/catgirl/Makefile
+++ b/vm/app/catgirl/Makefile
@@ -8,6 +8,7 @@ QEMU_KVM = qemu-kvm
CLOUD_HYPERVISOR = cloud-hypervisor
VMM = qemu
+SCRIPTS = ../../../scripts
HOST_FILES = host/data/appvm-catgirl/providers/net/netvm
@@ -33,9 +34,15 @@ build/host/data/appvm-catgirl/vmlinux: $(VMLINUX)
mkdir -p $$(dirname $@)
cp $(VMLINUX) $@
+build/host/data/appvm-catgirl/blk/root.img: $(SCRIPTS)/make-gpt.sh $(SCRIPTS)/sfdisk-field.awk build/rootfs.ext4
+ mkdir -p $$(dirname $@)
+ $(SCRIPTS)/make-gpt.sh $@.tmp \
+ build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:0d2f5f77-eb9c-453a-9463-daafcb5ce2b2:root
+ mv $@.tmp $@
+
# tar2ext4 will leave half a filesystem behind if it's interrupted
# half way through.
-build/host/data/appvm-catgirl/blk/root.img: build/rootfs.tar
+build/rootfs.ext4: build/rootfs.tar
mkdir -p $$(dirname $@)
tar2ext4 -i build/rootfs.tar -o $@.tmp
mv $@.tmp $@
@@ -95,7 +102,7 @@ build/etc/s6-rc: $(VM_S6_RC_FILES)
run-qemu: build/host/data/appvm-catgirl/blk/root.img
$(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \
-drive file=build/host/data/appvm-catgirl/blk/root.img,if=virtio,format=raw,readonly=on \
- -append "console=ttyS0 root=/dev/vda" \
+ -append "console=ttyS0 root=PARTLABEL=root" \
-netdev user,id=net0 \
-device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \
-chardev vc,id=virtiocon0 \
@@ -110,7 +117,7 @@ run-cloud-hypervisor: build/host/data/appvm-catgirl/blk/root.img
--disk path=build/host/data/appvm-catgirl/blk/root.img,readonly=on \
--net tap=tap0,mac=0A:B3:EC:00:00:00 \
--kernel $(KERNEL) \
- --cmdline "console=ttyS0 root=/dev/vda" \
+ --cmdline "console=ttyS0 root=PARTLABEL=root" \
--console tty \
--serial pty
.PHONY: run-cloud-hypervisor
diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix
index 61f1462..d83392d 100644
--- a/vm/app/catgirl/default.nix
+++ b/vm/app/catgirl/default.nix
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is>
{ config ? import ../../../nix/eval-config.nix {}
, terminfo ? config.pkgs.foot.terminfo
@@ -8,13 +8,15 @@
config.pkgs.pkgsStatic.callPackage (
{ lib, stdenvNoCC, runCommand, writeReferencesToFile, buildPackages
-, s6-rc, tar2ext4
+, jq, s6-rc, tar2ext4, util-linux
, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-linux-init
}:
let
inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix;
+ scripts = import ../../../scripts { inherit config; };
+
packages = [
catgirl execline kmod mdevd s6 s6-linux-init s6-rc
@@ -71,11 +73,13 @@ stdenvNoCC.mkDerivation {
src = cleanSource ./.;
};
- nativeBuildInputs = [ s6-rc tar2ext4 ];
+ nativeBuildInputs = [ jq s6-rc tar2ext4 util-linux ];
PACKAGES_TAR = packagesTar;
VMLINUX = "${kernel.dev}/vmlinux";
+ makeFlags = [ "SCRIPTS=${scripts}" ];
+
installPhase = ''
mv build/svc $out
'';
diff --git a/vm/app/lynx/Makefile b/vm/app/lynx/Makefile
index ff87cb8..ff42501 100644
--- a/vm/app/lynx/Makefile
+++ b/vm/app/lynx/Makefile
@@ -8,6 +8,7 @@ QEMU_KVM = qemu-kvm
CLOUD_HYPERVISOR = cloud-hypervisor
VMM = qemu
+SCRIPTS = ../../../scripts
HOST_FILES = host/data/appvm-lynx/providers/net/netvm
@@ -33,9 +34,15 @@ build/host/data/appvm-lynx/vmlinux: $(VMLINUX)
mkdir -p $$(dirname $@)
cp $(VMLINUX) $@
+build/host/data/appvm-lynx/blk/root.img: $(SCRIPTS)/make-gpt.sh $(SCRIPTS)/sfdisk-field.awk build/rootfs.ext4
+ mkdir -p $$(dirname $@)
+ $(SCRIPTS)/make-gpt.sh $@.tmp \
+ build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:41e8068d-38d5-4135-ad77-0da704743940:root
+ mv $@.tmp $@
+
# tar2ext4 will leave half a filesystem behind if it's interrupted
# half way through.
-build/host/data/appvm-lynx/blk/root.img: build/rootfs.tar
+build/rootfs.ext4: build/rootfs.tar
mkdir -p $$(dirname $@)
tar2ext4 -i build/rootfs.tar -o $@.tmp
mv $@.tmp $@
@@ -94,7 +101,7 @@ build/etc/s6-rc: $(VM_S6_RC_FILES)
run-qemu: build/host/data/appvm-lynx/blk/root.img
$(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \
-drive file=build/host/data/appvm-lynx/blk/root.img,if=virtio,format=raw,readonly=on \
- -append "console=ttyS0 root=/dev/vda" \
+ -append "console=ttyS0 root=PARTLABEL=root" \
-netdev user,id=net0 \
-device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \
-chardev vc,id=virtiocon0 \
@@ -109,7 +116,7 @@ run-cloud-hypervisor: build/host/data/appvm-lynx/blk/root.img
--disk path=build/host/data/appvm-lynx/blk/root.img,readonly=on \
--net tap=tap0,mac=0A:B3:EC:00:00:00 \
--kernel $(KERNEL) \
- --cmdline "console=ttyS0 root=/dev/vda" \
+ --cmdline "console=ttyS0 root=PARTLABEL=root" \
--console tty \
--serial pty
.PHONY: run-cloud-hypervisor
diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix
index ba715ec..92635f3 100644
--- a/vm/app/lynx/default.nix
+++ b/vm/app/lynx/default.nix
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is>
{ config ? import ../../../nix/eval-config.nix {}
, terminfo ? config.pkgs.foot.terminfo
@@ -8,13 +8,15 @@
config.pkgs.pkgsStatic.callPackage (
{ lib, stdenvNoCC, runCommand, writeReferencesToFile, buildPackages
-, s6-rc, tar2ext4
+, jq, s6-rc, tar2ext4, util-linux
, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-init
}:
let
inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix;
+ scripts = import ../../../scripts { inherit config; };
+
packages = [
execline kmod lynx mdevd s6 s6-linux-init s6-rc
@@ -71,11 +73,13 @@ stdenvNoCC.mkDerivation {
src = cleanSource ./.;
};
- nativeBuildInputs = [ s6-rc tar2ext4 ];
+ nativeBuildInputs = [ jq s6-rc tar2ext4 util-linux ];
PACKAGES_TAR = packagesTar;
VMLINUX = "${kernel.dev}/vmlinux";
+ makeFlags = [ "SCRIPTS=${scripts}" ];
+
installPhase = ''
mv build/svc $out
'';
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile
index 0b5fe8f..2b9004b 100644
--- a/vm/sys/net/Makefile
+++ b/vm/sys/net/Makefile
@@ -8,6 +8,7 @@ QEMU_KVM = qemu-kvm
CLOUD_HYPERVISOR = cloud-hypervisor
VMM = qemu
+SCRIPTS = ../../../scripts
HOST_BUILD_FILES = \
build/host/data/netvm/blk/root.img \
@@ -30,9 +31,15 @@ build/host/data/netvm/vmlinux: $(VMLINUX)
mkdir -p $$(dirname $@)
cp $(VMLINUX) $@
+build/host/data/netvm/blk/root.img: $(SCRIPTS)/make-gpt.sh $(SCRIPTS)/sfdisk-field.awk build/rootfs.ext4
+ mkdir -p $$(dirname $@)
+ $(SCRIPTS)/make-gpt.sh $@.tmp \
+ build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:ea21da27-0391-48da-9235-9d2ab2ca7844:root
+ mv $@.tmp $@
+
# tar2ext4 will leave half a filesystem behind if it's interrupted
# half way through.
-build/host/data/netvm/blk/root.img: build/rootfs.tar
+build/rootfs.ext4: build/rootfs.tar
mkdir -p $$(dirname $@)
tar2ext4 -i build/rootfs.tar -o $@.tmp
mv $@.tmp $@
@@ -100,7 +107,7 @@ build/etc/s6-rc: $(VM_S6_RC_FILES)
run-qemu: build/host/data/netvm/blk/root.img
$(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \
-drive file=build/host/data/netvm/blk/root.img,if=virtio,format=raw,readonly=on \
- -append "console=ttyS0 root=/dev/vda" \
+ -append "console=ttyS0 root=PARTLABEL=root" \
-netdev user,id=net0 \
-device e1000e,netdev=net0 \
-netdev user,id=net1 \
@@ -117,7 +124,7 @@ run-cloud-hypervisor: build/host/data/netvm/blk/root.img
--disk path=build/host/data/netvm/blk/root.img,readonly=on \
--net tap=tap0 tap=tap1,mac=0A:B3:EC:80:00:00 \
--kernel $(KERNEL) \
- --cmdline "console=ttyS0 root=/dev/vda" \
+ --cmdline "console=ttyS0 root=PARTLABEL=root" \
--console tty \
--serial pty
.PHONY: run-cloud-hypervisor
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix
index dfc7c35..e9a2f05 100644
--- a/vm/sys/net/default.nix
+++ b/vm/sys/net/default.nix
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is>
{ config ? import ../../../nix/eval-config.nix {}
, terminfo ? config.pkgs.foot.terminfo
@@ -8,7 +8,7 @@
config.pkgs.pkgsStatic.callPackage (
{ lib, stdenvNoCC, runCommand, writeReferencesToFile, buildPackages
-, s6-rc, tar2ext4, xorg
+, jq, s6-rc, tar2ext4, util-linux, xorg
, busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6
, s6-linux-init
}:
@@ -16,6 +16,8 @@ config.pkgs.pkgsStatic.callPackage (
let
inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix;
+ scripts = import ../../../scripts { inherit config; };
+
connman = connmanMinimal;
packages = [
@@ -80,11 +82,13 @@ stdenvNoCC.mkDerivation {
src = cleanSource ./.;
};
- nativeBuildInputs = [ s6-rc tar2ext4 ];
+ nativeBuildInputs = [ jq s6-rc tar2ext4 util-linux ];
PACKAGES_TAR = packagesTar;
VMLINUX = "${kernel.dev}/vmlinux";
+ makeFlags = [ "SCRIPTS=${scripts}" ];
+
installPhase = ''
mv build/svc $out
'';
--
2.37.1
next prev parent reply other threads:[~2022-10-10 23:33 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 23:28 [PATCH 00/22] Implement managing VMs with Nix Alyssa Ross
2022-10-10 23:28 ` [PATCH 01/22] host/start-vm: use MAP_SHARED memory for VMs Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 02/22] host/start-vm: implement shared directories Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 03/22] host/rootfs: generate virtiofsd services Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 04/22] Documentation: explain VM shared directories Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 05/22] vm-lib/make-vm.nix: support " Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 06/22] img/app: add support for testing virtiofs Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 07/22] img/app: don't block app startup on network online Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 08/22] img/app: auto-mount virtiofs0 filesystem Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 09/22] vm/app/mg.nix: init Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 10/22] vm/app/mg.nix: open virtio filesystem in dired Alyssa Ross
2023-02-26 19:17 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 11/22] host/rootfs: move ext mounting to s6-rc service Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 12/22] host/rootfs: automatically grow user partition Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 13/22] host/rootfs: use a bigger test ext partition Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 14/22] host/initramfs/extfs.nix: tar2ext4 -> mkfs.ext4 -d Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-10 23:28 ` [PATCH 15/22] host/start-vm: resolve VM symlinks with /ext root Alyssa Ross
2022-10-10 23:28 ` [PATCH 16/22] host/rootfs: " Alyssa Ross
2022-10-10 23:28 ` [PATCH 17/22] Documentation: explain /ext symlink resolution Alyssa Ross
2022-10-10 23:28 ` [PATCH 18/22] host/start-vm: increase memory size to 512M Alyssa Ross
2022-10-10 23:28 ` [PATCH 19/22] vm/app/nix: add Alyssa Ross
2022-10-10 23:29 ` [PATCH 20/22] vm-lib/make-vms.nix: add Alyssa Ross
2022-10-10 23:29 ` [PATCH 21/22] host/initramfs/extfs.nix: add example Nix-built VM Alyssa Ross
2022-10-10 23:29 ` [PATCH 22/22] Documentation: add how-to guide for Nix-built VMs Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 0/6] Introduce a shared base for application VMs Alyssa Ross
2022-10-10 23:37 ` Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 1/6] host/start-vm: support multiple block devices Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 2/6] scripts/make-gpt.sh: add support for labels Alyssa Ross
2022-10-10 23:29 ` Alyssa Ross [this message]
2022-10-10 23:29 ` [PATCH v2 4/6] host/start-vm: boot using partition label Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 5/6] release: rename from "img" Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 6/6] img/app: extract from appvm-{lynx,catgirl} Alyssa Ross
-- strict thread matches above, loose matches on Subject: below --
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 3/6] vm: build GPT images Alyssa Ross
2022-11-14 1:14 ` 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=20221010232909.1953738-27-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).