[PATCH 0/2] host/rootfs: remove unnecessary coldplug dependencies
I didn't want to block the udev series on this, but I really don't think these dependencies are necessary. Rationale in each patch. Alyssa Ross (2): host/rootfs: remove vmm-env coldplug dependency host/rootfs: remove vm-env coldplug dependency host/rootfs/file-list.mk | 2 -- .../image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug | 0 .../image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug | 0 3 files changed, 2 deletions(-) delete mode 100644 host/rootfs/image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug delete mode 100644 host/rootfs/image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug base-commit: 36d2f0bd5caf297efec0e41f42e5983ae9dc1cb1 -- 2.51.0
The only thing that waits for vmm-env is running vm-import for the system VMs. This means setting up TAP devices and bind mounts, and starting dbus, virtiofsd, crosvm, and xdg-desktop-portal-spectrum-host. None of this should have any udev requirements. VMs won't actually boot until vm-env. Fixes: ced08f7 ("host/rootfs: Switch to systemd-udevd") Signed-off-by: Alyssa Ross <hi@alyssa.is> --- host/rootfs/file-list.mk | 1 - .../image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug | 0 2 files changed, 1 deletion(-) delete mode 100644 host/rootfs/image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk index 9acaa1d..08b5b9e 100644 --- a/host/rootfs/file-list.mk +++ b/host/rootfs/file-list.mk @@ -89,7 +89,6 @@ S6_RC_FILES = \ image/etc/s6-rc/vm-env/type \ image/etc/s6-rc/vmm-env/contents.d/core \ image/etc/s6-rc/vmm-env/contents.d/static-nodes \ - image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug \ image/etc/s6-rc/vmm-env/type \ image/etc/s6-rc/weston/dependencies.d/systemd-udevd-coldplug \ image/etc/s6-rc/weston/notification-fd \ diff --git a/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug b/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug deleted file mode 100644 index e69de29..0000000 -- 2.51.0
The only thing that waits for vm-env is booting VMs that have already been created. This does not have a udev dependency. (Although it will still have one indirectly, since it does require Weston to be up.) Fixes: ced08f7 ("host/rootfs: Switch to systemd-udevd") Signed-off-by: Alyssa Ross <hi@alyssa.is> --- host/rootfs/file-list.mk | 1 - .../image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug | 0 2 files changed, 1 deletion(-) delete mode 100644 host/rootfs/image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk index 08b5b9e..a202134 100644 --- a/host/rootfs/file-list.mk +++ b/host/rootfs/file-list.mk @@ -84,7 +84,6 @@ S6_RC_FILES = \ image/etc/s6-rc/systemd-udevd/run \ image/etc/s6-rc/systemd-udevd/type \ image/etc/s6-rc/vm-env/contents.d/static-nodes \ - image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug \ image/etc/s6-rc/vm-env/contents.d/weston \ image/etc/s6-rc/vm-env/type \ image/etc/s6-rc/vmm-env/contents.d/core \ diff --git a/host/rootfs/image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug b/host/rootfs/image/etc/s6-rc/vm-env/contents.d/systemd-udevd-coldplug deleted file mode 100644 index e69de29..0000000 -- 2.51.0
participants (1)
-
Alyssa Ross