Skip to content

Commit 376b156

Browse files
cdesiniotiscdesiniotis
authored
Merge pull request #345 from NVIDIA/64kkernelfix
Addition of 64k kernel-flavor in KERNEL_VERSION
2 parents 50583a1 + 457c666 commit 376b156

File tree

7 files changed

+23
-14
lines changed

7 files changed

+23
-14
lines changed

‎ubuntu16.04/nvidia-driver‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@ _cleanup_package_cache() {
2828
_resolve_kernel_version() {
2929
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
3030
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
31-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
31+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
32+
kernel_flavor="${kernel_flavor//virtual/generic}"
3233

3334
echo "Resolving Linux kernel version..."
3435
if [ -z "${version}" ]; then
3536
echo "Could not resolve Linux kernel version" >&2
3637
return 1
3738
fi
38-
KERNEL_VERSION="${version}-${flavor:-generic}"
39+
40+
KERNEL_VERSION="${version}-${kernel_flavor}"
3941
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
4042
return 0
4143
}

‎ubuntu18.04/nvidia-driver‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@ _cleanup_package_cache() {
3131
_resolve_kernel_version() {
3232
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
3333
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
34-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
34+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
35+
kernel_flavor="${kernel_flavor//virtual/generic}"
3536

3637
echo "Resolving Linux kernel version..."
3738
if [ -z "${version}" ]; then
3839
echo "Could not resolve Linux kernel version" >&2
3940
return 1
4041
fi
41-
KERNEL_VERSION="${version}-${flavor:-generic}"
42+
43+
KERNEL_VERSION="${version}-${kernel_flavor}"
4244
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
4345
return 0
4446
}

‎ubuntu20.04/nvidia-driver‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ _update_ca_certificates() {
4747
_resolve_kernel_version() {
4848
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
4949
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
50-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
50+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
51+
kernel_flavor="${kernel_flavor//virtual/generic}"
5152

5253
echo "Resolving Linux kernel version..."
5354
if [ -z "${version}" ]; then
5455
echo "Could not resolve Linux kernel version" >&2
5556
return 1
5657
fi
5758

58-
KERNEL_VERSION="${version}-${flavor:-generic}"
59+
KERNEL_VERSION="${version}-${kernel_flavor}"
5960
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
6061
return 0
6162
}

‎ubuntu22.04/nvidia-driver‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ _update_ca_certificates() {
4747
_resolve_kernel_version() {
4848
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
4949
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
50-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
50+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
51+
kernel_flavor="${kernel_flavor//virtual/generic}"
5152

5253
echo "Resolving Linux kernel version..."
5354
if [ -z "${version}" ]; then
5455
echo "Could not resolve Linux kernel version" >&2
5556
return 1
5657
fi
5758

58-
KERNEL_VERSION="${version}-${flavor:-generic}"
59+
KERNEL_VERSION="${version}-${kernel_flavor}"
5960
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
6061
return 0
6162
}

‎ubuntu24.04/nvidia-driver‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ _update_ca_certificates() {
4747
_resolve_kernel_version() {
4848
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
4949
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
50-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
50+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
51+
kernel_flavor="${kernel_flavor//virtual/generic}"
5152

5253
echo "Resolving Linux kernel version..."
5354
if [ -z "${version}" ]; then
5455
echo "Could not resolve Linux kernel version" >&2
5556
return 1
5657
fi
5758

58-
KERNEL_VERSION="${version}-${flavor:-generic}"
59+
KERNEL_VERSION="${version}-${kernel_flavor}"
5960
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
6061
return 0
6162
}

‎vgpu-manager/ubuntu20.04/nvidia-driver‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ _cleanup_package_cache() {
2929
_resolve_kernel_version() {
3030
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
3131
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
32-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
32+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
33+
kernel_flavor="${kernel_flavor//virtual/generic}"
3334

3435
echo "Resolving Linux kernel version..."
3536
if [ -z "${version}" ]; then
3637
echo "Could not resolve Linux kernel version" >&2
3738
return 1
3839
fi
3940

40-
KERNEL_VERSION="${version}-${flavor:-generic}"
41+
KERNEL_VERSION="${version}-${kernel_flavor}"
4142
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
4243
return 0
4344
}

‎vgpu-manager/ubuntu22.04/nvidia-driver‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ _cleanup_package_cache() {
2929
_resolve_kernel_version() {
3030
local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
3131
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
32-
local flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//' | grep -Ev "^generic|virtual")
32+
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
33+
kernel_flavor="${kernel_flavor//virtual/generic}"
3334

3435
echo "Resolving Linux kernel version..."
3536
if [ -z "${version}" ]; then
3637
echo "Could not resolve Linux kernel version" >&2
3738
return 1
3839
fi
3940

40-
KERNEL_VERSION="${version}-${flavor:-generic}"
41+
KERNEL_VERSION="${version}-${kernel_flavor}"
4142
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
4243
return 0
4344
}

0 commit comments

Comments
 (0)