From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 3 Jul 2014 17:00:49 +0000 (+0100)
Subject: Force kvm_intel nested=1 in nested guests.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=03302ad267329a2d659a299b975ce9b49d44a800;p=supernested.git

Force kvm_intel nested=1 in nested guests.
---

diff --git a/build-supernested.sh.in b/build-supernested.sh.in
index bd006ae..20f6a1f 100644
--- a/build-supernested.sh.in
+++ b/build-supernested.sh.in
@@ -66,10 +66,14 @@ echo "them, but encourage your distro to stop using security-through-obscurity."
 # Add the kernel and initrd to the image.
 # We have to do this here, AFTER the build step, because we don't
 # have the kernel & initrd before this.
-echo "Adding kernel and initrd to the disk image ..."
-"$guestfish" --format=raw -a tmp-appliance.d/root -m /dev/sda <<EOF
+"$guestfish" --format=raw -a tmp-appliance.d/root -m /dev/sda <<'EOF'
+  echo "Adding kernel and initrd to the disk image ..."
   upload tmp-appliance.d/kernel /kernel
   upload tmp-appliance.d/initrd /initrd
+
+  echo "Adjusting configuration files in the image ..."
+  mkdir-p /etc/modprobe.d
+  write /etc/modprobe.d/kvm.conf "options kvm_intel nested=1"
 EOF
 
 # Copy out the kernel, initrd and disk image.