Merge lp:~rcj/vmbuilder/jenkins_kvm into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Robert C Jennings]

Azure: Blacklist nouveau driver

Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels

Azure: Blacklist nouveau driver

Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels

[Philip Roche (philroche)]

LGTM

review: Approve

[Francis Ginther (fginther)]

Approve

review: Approve

[lp:~rcj/vmbuilder/jenkins_kvm]

807. By Robert C Jennings on 2018-08-14

Merge lp:~rcj/vmbuilder/jenkins_kvm into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm [a=rcj] [r=fginther,philroche]

Azure: Blacklist nouveau driver

Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels

MP: https://code.launchpad.net/~rcj/vmbuilder/jenkins_kvm/+merge/352958

=== modified file 'templates/img-azure-14.04-addin.tmpl'
--- templates/img-azure-14.04-addin.tmpl	2015-06-08 15:57:31 +0000
+++ templates/img-azure-14.04-addin.tmpl	2018-08-13 08:51:48 +0000
@@ -19,7 +19,6 @@
 
 # Do not wait on grub prompt
 GRUB_TIMEOUT=0
-
 EOF
 
 # Add in the client keep alive
@@ -49,6 +48,7 @@
 
 EOF
 
+# Frame buffer fix
 cat << EOF >> "${mp}/etc/initramfs-tools/modules"
 
 # Need for slow boot times due to framebuffer

=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl	2018-07-25 18:59:22 +0000
+++ templates/img-azure.tmpl	2018-08-13 08:51:48 +0000
@@ -254,6 +254,14 @@
 xchroot sed -i 's,SHELL=/bin/sh,SHELL=/bin/bash,g' /etc/default/useradd
 xchroot sed -i "1i${CLOUD_IMG_STR}" /etc/default/useradd
 
+# Blacklist nouveau driver
+cat > "${mp}/etc/modprobe.d/blacklist-nouveau.conf" <<EOF
+${CLOUD_IMG_STR}
+# Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels
+blacklist nouveau
+options nouveau modeset=0
+EOF
+
 # Reconfigure initramfs
 debug "Reconfiguring initramfs"
 xchroot update-initramfs -u -k all