From 6f18d0e5adf5dcf45e99b2d38de9fc87e3ca0736 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 16 Jul 2013 00:49:51 +0000 Subject: [PATCH] udeb: Move virtio_scsi to virtio-modules svn path=/dists/sid/linux/; revision=20352 --- debian/changelog | 3 ++- debian/installer/modules/scsi-extra-modules | 1 - debian/installer/modules/virtio-modules | 1 + debian/installer/package-list | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 752879224..66c08962a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,7 +45,8 @@ linux (3.10.1-1) UNRELEASED; urgency=low - debian/control: Put xen-linux-system-* in the 'metapackages' section * linux-source: Add bc to recommended packages (Closes: #715413) * udeb: Add ath6kl_usb and mwifiex_usb to nic-wireless-modules - * udeb: Add pm80xx (previously pm8001) and virtio_scsi to scsi-extra-modules + * udeb: Add pm80xx (previously pm8001) to scsi-extra-modules + * udeb: Add virtio_scsi to virtio-modules * Set ABI to 1 * xen/blkback: Check device permissions before allowing OP_DISCARD (CVE-2013-2140) diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules index 245920aaf..2d45395dc 100644 --- a/debian/installer/modules/scsi-extra-modules +++ b/debian/installer/modules/scsi-extra-modules @@ -46,5 +46,4 @@ qla4xxx ? sym53c416 ? ufshcd ? ufshcd-pci ? -virtio_scsi ? vmw_pvscsi ? diff --git a/debian/installer/modules/virtio-modules b/debian/installer/modules/virtio-modules index 84d09e4d7..04ae7e89b 100644 --- a/debian/installer/modules/virtio-modules +++ b/debian/installer/modules/virtio-modules @@ -1,6 +1,7 @@ virtio_net virtio_blk virtio_balloon +virtio_scsi # Some architectures do not have PCI bus virtio_pci ? diff --git a/debian/installer/package-list b/debian/installer/package-list index 372be8f7c..6e8b79e8b 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -398,7 +398,7 @@ Description: RTC modules This package contains RTC modules. Package: virtio-modules -Depends: kernel-image +Depends: kernel-image, scsi-core-modules Priority: extra Description: virtio modules This package contains virtio modules.