aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/disk-image-builder/nested
diff options
context:
space:
mode:
Diffstat (limited to 'resources/tools/disk-image-builder/nested')
-rw-r--r--resources/tools/disk-image-builder/nested/CHANGELOG8
-rwxr-xr-xresources/tools/disk-image-builder/nested/image-patches/06-dpdk-support11
-rw-r--r--resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk8
3 files changed, 23 insertions, 4 deletions
diff --git a/resources/tools/disk-image-builder/nested/CHANGELOG b/resources/tools/disk-image-builder/nested/CHANGELOG
index 50217e28c8..9901d1379d 100644
--- a/resources/tools/disk-image-builder/nested/CHANGELOG
+++ b/resources/tools/disk-image-builder/nested/CHANGELOG
@@ -1,3 +1,11 @@
+## [1.6] - 2017-02-20
+
+### Changes
+- replace /dev/sda to /dev/vda, to use with virtio disk driver
+- add noapic to bootloader's kernel line
+- bind igb_uio driver only to network device
+
+
## [1.5] - 2016-11-14
### Changes
diff --git a/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support b/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support
index 5990f0925b..2de4ad6962 100755
--- a/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support
+++ b/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support
@@ -46,10 +46,13 @@ echo 1af4 1000 > /sys/bus/pci/drivers/${TARGET_DRIVER}/new_id
#
for dev in $(find /sys/bus/pci/drivers/virtio-pci -type l -name '*:*:*.*' | sed -e 's/.*\///')
do
- echo Unbinding $dev from virtio-pci
- echo $dev > /sys/bus/pci/drivers/virtio-pci/unbind
- echo Binding $dev to ${TARGET_DRIVER}
- echo $dev > /sys/bus/pci/drivers/${TARGET_DRIVER}/bind
+ class=$(cat /sys/bus/pci/drivers/virtio-pci/${dev}/class)
+ if [ "$class" = "0x020000" ]; then
+ echo Unbinding $dev from virtio-pci
+ echo $dev > /sys/bus/pci/drivers/virtio-pci/unbind
+ echo Binding $dev to ${TARGET_DRIVER}
+ echo $dev > /sys/bus/pci/drivers/${TARGET_DRIVER}/bind
+ fi
done
# RCU and IRQ affinity
diff --git a/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk b/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk
new file mode 100644
index 0000000000..5ef2782d52
--- /dev/null
+++ b/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+patch boot/grub/menu.lst <<"_EOF"
+17c17
+< kernel /boot/bzImage rw root=/dev/sda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable
+---
+> kernel /boot/bzImage rw root=/dev/vda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable noapic
+_EOF