Merge ~dannf/+git/maas-preseeds:oot-driver-updates into ~ce-hyperscale/+git/maas-preseeds:main

Proposed by dann frazier
Status: Merged
Merged at revision: 05bdd105e694f97d9fc7ba6c19a3bdc421cbc0ba
Proposed branch: ~dannf/+git/maas-preseeds:oot-driver-updates
Merge into: ~ce-hyperscale/+git/maas-preseeds:main
Diff against target: 44 lines (+13/-6)
1 file modified
late.sh (+13/-6)
Reviewer Review Type Date Requested Status
Hon Ming Hui Approve
Review via email: mp+444311@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hon Ming Hui (hm-hui) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/late.sh b/late.sh
2index 29cfe7e..0b260b3 100755
3--- a/late.sh
4+++ b/late.sh
5@@ -4,18 +4,25 @@ set -e
6 set -x
7
8 export DEBIAN_FRONTEND=noninteractive
9-NVIDIA_DRIVER_VERSION=470-server
10+UBUNTU_VER="$(lsb_release -rs)"
11+case $UBUNTU_VER in
12+ 18.04|20.04)
13+ NVIDIA_DRIVER_VERSION=470-server
14+ ;;
15+ *)
16+ NVIDIA_DRIVER_VERSION=525-server
17+ ;;
18+esac
19+
20
21 install_mellanox_ofed() {
22 local MLNX_REPO="https://linux.mellanox.com/public/repo/mlnx_ofed"
23- local ubuntu_ver
24- ubuntu_ver="$(lsb_release -rs)"
25- case $ubuntu_ver in
26+ case $UBUNTU_VER in
27 20.04)
28 MELLANOX_OFED_VERSION=5.4-3.5.8.0
29 ;;
30 18.04)
31- MELLANOX_OFED_VERSION=4.9-2.2.4.0
32+ MELLANOX_OFED_VERSION=4.9-4.1.7.0
33 ;;
34 *)
35 # nvidia seems to make future DGX MOFED-less, and DGX OS starting
36@@ -23,7 +30,7 @@ install_mellanox_ofed() {
37 # performance characteristics for jammy and above.
38 return 0
39 esac
40- mlnx_url="${MLNX_REPO}/${MELLANOX_OFED_VERSION}/ubuntu${ubuntu_ver}/mellanox_mlnx_ofed.list"
41+ mlnx_url="${MLNX_REPO}/${MELLANOX_OFED_VERSION}/ubuntu${UBUNTU_VER}/mellanox_mlnx_ofed.list"
42
43 wget -O - https://www.mellanox.com/downloads/ofed/RPM-GPG-KEY-Mellanox | \
44 apt-key add -

Subscribers

People subscribed via source and target branches

to all changes: