Bug 1273286 - Upgrade NVIDIA drivers to 361.42, switch to graphics-drivers PPA. r?rail
--- a/modules/gui/manifests/init.pp
+++ b/modules/gui/manifests/init.pp
@@ -8,17 +8,17 @@ class gui(
$screen_height,
$screen_depth,
$refresh
) {
include config
include users::builder
include gui::appearance
- $nvidia_version = '310.32'
+ $nvidia_version = '361.42'
$gpu_bus_id = "PCI:01:00:0"
# only use the nvidia drivers and settings if we're using a GPU, and are not
# in virtualization mode
$use_nvidia = $on_gpu and $::virtual == "physical"
case $::operatingsystem {
Darwin: {
--- a/modules/packages/manifests/nvidia_drivers.pp
+++ b/modules/packages/manifests/nvidia_drivers.pp
@@ -1,22 +1,22 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
class packages::nvidia_drivers {
include needs_reboot
- realize(Packages::Aptrepo['xorg-edgers'])
+ realize(Packages::Aptrepo['graphics-drivers'])
- # The Ubuntu xorg-edgers reqo embeds the version number in the package
+ # The Ubuntu graphics-drivers repo embeds the version number in the package
# name, so we can easily require "latest"
- $nvidia_version = "310"
- $nvidia_full_version = "310.32"
+ $nvidia_version = "361"
+ $nvidia_full_version = "361.42"
case $::operatingsystem {
Ubuntu: {
package {
"nvidia-$nvidia_version":
ensure => latest,
require => Class['packages::kernel'],
# the nvidia drivers need to be loaded, which usually
--- a/modules/packages/manifests/setup.pp
+++ b/modules/packages/manifests/setup.pp
@@ -191,18 +191,18 @@ class packages::setup {
distribution => "${lsbdistcodename}-updates",
components => ["all"];
"puppetlabs":
url_path => "repos/apt/puppetlabs",
distribution => "${lsbdistcodename}",
components => ["dependencies", "main"];
}
@packages::aptrepo {
- "xorg-edgers":
- url_path => "repos/apt/xorg-edgers",
+ "graphics-drivers":
+ url_path => "repos/apt/graphics-drivers",
distribution => "${lsbdistcodename}",
components => ["main"];
"nginx-development":
url_path => "repos/apt/nginx-development",
distribution => "${lsbdistcodename}",
components => ["main"];
"mig-agent":
url_path => "repos/apt/custom/mig-agent",