[PATCH] fix virtio udeb layout (LP: #257739)

[Colin Watson]

We should move virtio_blk into block-modules, and virtio_net into
nic-modules; that way the installer will naturally pull those in without
us having to fiddle around with the d-i build system in yet more
painful-to-merge ways.

LP: #257739

diff --git a/debian/d-i/modules/block-modules b/debian/d-i/modules/block-modules
index 273ac5f..9be4b97 100644
--- a/debian/d-i/modules/block-modules
+++ b/debian/d-i/modules/block-modules
@@ -28,3 +28,4 @@ pt
 sx8
 ub
 umem
+virtio_blk ?
diff --git a/debian/d-i/modules/virtio-modules b/debian/d-i/modules/virtio-modules
index 2d3492e..c5cc1d1 100644
--- a/debian/d-i/modules/virtio-modules
+++ b/debian/d-i/modules/virtio-modules
@@ -1,6 +1,4 @@
 virtio_balloon
-virtio_blk
-virtio_net
 virtio_pci
 virtio_ring ?
 virtio-rng
diff --git a/debian/d-i/package-list b/debian/d-i/package-list
index 921d988..0f0bb55 100644
--- a/debian/d-i/package-list
+++ b/debian/d-i/package-list
@@ -59,7 +59,7 @@ Priority: standard
 Description: Multi-device support (raid, device-mapper, lvm)
 
 Package: nic-modules
-Depends: kernel-image, nic-shared-modules
+Depends: kernel-image, nic-shared-modules, virtio-modules
 Priority: standard
 Description: Network interface support
 
@@ -139,7 +139,7 @@ Description: NFS filesystem drivers
 
 Package: block-modules
 Priority: standard
-Depends: kernel-image, storage-core-modules, parport-modules
+Depends: kernel-image, storage-core-modules, parport-modules, virtio-modules
 Description: Block storage devices
  This package contains the block storage devices, including DAC960 and
  paraide.

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]