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

Proposed by Robert C Jennings on 2018-08-13
Status: Merged
Merged at revision: 807
Proposed branch: lp:~rcj/vmbuilder/jenkins_kvm
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 38 lines (+9/-1)
2 files modified
templates/img-azure-14.04-addin.tmpl (+1/-1)
templates/img-azure.tmpl (+8/-0)
To merge this branch: bzr merge lp:~rcj/vmbuilder/jenkins_kvm
Reviewer Review Type Date Requested Status
Francis Ginther 2018-08-13 Approve on 2018-08-14
Philip Roche 2018-08-13 Approve on 2018-08-13
Review via email: mp+352958@code.launchpad.net

Commit message

Azure: Blacklist nouveau driver

Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels

Description of the change

Azure: Blacklist nouveau driver

Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels

To post a comment you must log in.
Philip Roche (philroche) wrote :

LGTM

review: Approve
Francis Ginther (fginther) wrote :

Approve

review: Approve
lp:~rcj/vmbuilder/jenkins_kvm updated on 2018-08-14
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1919
20# Do not wait on grub prompt20# Do not wait on grub prompt
21GRUB_TIMEOUT=021GRUB_TIMEOUT=0
22
23EOF22EOF
2423
25# Add in the client keep alive24# Add in the client keep alive
@@ -49,6 +48,7 @@
4948
50EOF49EOF
5150
51# Frame buffer fix
52cat << EOF >> "${mp}/etc/initramfs-tools/modules"52cat << EOF >> "${mp}/etc/initramfs-tools/modules"
5353
54# Need for slow boot times due to framebuffer54# Need for slow boot times due to framebuffer
5555
=== 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 @@
254xchroot sed -i 's,SHELL=/bin/sh,SHELL=/bin/bash,g' /etc/default/useradd254xchroot sed -i 's,SHELL=/bin/sh,SHELL=/bin/bash,g' /etc/default/useradd
255xchroot sed -i "1i${CLOUD_IMG_STR}" /etc/default/useradd255xchroot sed -i "1i${CLOUD_IMG_STR}" /etc/default/useradd
256256
257# Blacklist nouveau driver
258cat > "${mp}/etc/modprobe.d/blacklist-nouveau.conf" <<EOF
259${CLOUD_IMG_STR}
260# Eliminate conflicts with nVIDIA drivers for GPU instances using stock kernels
261blacklist nouveau
262options nouveau modeset=0
263EOF
264
257# Reconfigure initramfs265# Reconfigure initramfs
258debug "Reconfiguring initramfs"266debug "Reconfiguring initramfs"
259xchroot update-initramfs -u -k all267xchroot update-initramfs -u -k all

Subscribers

People subscribed via source and target branches