diff --git a/base/generate-ci-config b/base/generate-ci-config index 94ba87943..75fa77135 100755 --- a/base/generate-ci-config +++ b/base/generate-ci-config @@ -13,7 +13,7 @@ SUPPORTED_KERNELS="" # Silent apt update export DEBIAN_FRONTEND=noninteractive -apt-get update -y -qq > /dev/null +apt-get update -y # Generate a list of all kernel versions which have NVIDIA precompiled driver packages available. SUPPORTED_KERNELS_LINUX_SIGNATURES_LIST=$(apt-cache search "linux-signatures-nvidia.*${LTS_KERNEL}.*${KERNEL_FLAVOR}" | awk '{print $1}' | sed -e "s/^.*${LTS_KERNEL}/${LTS_KERNEL}/" | sort -n -t'-' -k2| grep "${KERNEL_FLAVOR}$") diff --git a/ubuntu22.04/nvidia-driver b/ubuntu22.04/nvidia-driver index c52075e68..283dbbb68 100755 --- a/ubuntu22.04/nvidia-driver +++ b/ubuntu22.04/nvidia-driver @@ -28,7 +28,7 @@ echo "DRIVER_ARCH is $DRIVER_ARCH" _enable_fips_if_required() { if [[ -n "${UBUNTU_PRO_TOKEN}" && ${KERNEL_VERSION} =~ "fips" ]]; then echo "Ubuntu Pro token and FIPS kernel detected" - apt-get -qq install --no-install-recommends ubuntu-advantage-tools > /dev/null + apt-get install -y --no-install-recommends ubuntu-advantage-tools echo "Attaching Ubuntu Pro token..." pro attach --no-auto-enable "${UBUNTU_PRO_TOKEN}" echo "Enabling FIPS apt repo access..." @@ -98,11 +98,11 @@ _install_prerequisites() ( mkdir -p /lib/modules/${KERNEL_VERSION}/proc echo "Installing Linux kernel headers..." - apt-get -qq install --no-install-recommends linux-headers-${KERNEL_VERSION} > /dev/null + apt-get install -y --no-install-recommends linux-headers-${KERNEL_VERSION} echo "Installing Linux kernel module files..." - apt-get -qq download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . - { apt-get -qq download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } 2> /dev/null + apt-get download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . + { apt-get download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } mv lib/modules/${KERNEL_VERSION}/modules.* /lib/modules/${KERNEL_VERSION} mv lib/modules/${KERNEL_VERSION}/kernel /lib/modules/${KERNEL_VERSION} depmod ${KERNEL_VERSION} @@ -120,7 +120,7 @@ _install_prerequisites() ( # Cleanup the prerequisites installed above. _remove_prerequisites() { if [ "${PACKAGE_TAG:-}" != "builtin" ]; then - apt-get -qq purge linux-headers-${KERNEL_VERSION} > /dev/null + apt-get purge -y linux-headers-${KERNEL_VERSION} # TODO remove module files not matching an existing driver package. fi } diff --git a/ubuntu24.04/nvidia-driver b/ubuntu24.04/nvidia-driver index 59381f766..f3e0fdb66 100755 --- a/ubuntu24.04/nvidia-driver +++ b/ubuntu24.04/nvidia-driver @@ -28,7 +28,7 @@ echo "DRIVER_ARCH is $DRIVER_ARCH" _enable_fips_if_required() { if [[ -n "${UBUNTU_PRO_TOKEN}" && ${KERNEL_VERSION} =~ "fips" ]]; then echo "Ubuntu Pro token and FIPS kernel detected" - apt-get -qq install --no-install-recommends ubuntu-advantage-tools > /dev/null + apt-get install -y --no-install-recommends ubuntu-advantage-tools # This workaround is needed in Ubuntu 24.04 as OpenSSL attempts to leverage the FIPS provider # when the underlying kernel is FIPS enabled. @@ -39,7 +39,7 @@ _enable_fips_if_required() { echo "Enabling FIPS apt repo access..." pro enable --access-only --assume-yes fips-updates echo "Installing the OpenSSL FIPS modules" - apt-get -qq install --no-install-recommends ubuntu-fips-userspace > /dev/null + apt-get install -y --no-install-recommends ubuntu-fips-userspace # With the OpenSSL FIPS module installed, OpenSSL can now work with the default settings, unset OPENSSL_FORCE_FIPS_MODE @@ -108,11 +108,11 @@ _install_prerequisites() ( mkdir -p /lib/modules/${KERNEL_VERSION}/proc echo "Installing Linux kernel headers..." - apt-get -qq install --no-install-recommends linux-headers-${KERNEL_VERSION} > /dev/null + apt-get install -y --no-install-recommends linux-headers-${KERNEL_VERSION} echo "Installing Linux kernel module files..." - apt-get -qq download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . - { apt-get -qq download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } 2> /dev/null + apt-get download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . + { apt-get download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } mv lib/modules/${KERNEL_VERSION}/modules.* /lib/modules/${KERNEL_VERSION} mv lib/modules/${KERNEL_VERSION}/kernel /lib/modules/${KERNEL_VERSION} depmod ${KERNEL_VERSION} @@ -130,7 +130,7 @@ _install_prerequisites() ( # Cleanup the prerequisites installed above. _remove_prerequisites() { if [ "${PACKAGE_TAG:-}" != "builtin" ]; then - apt-get -qq purge linux-headers-${KERNEL_VERSION} > /dev/null + apt-get purge -y linux-headers-${KERNEL_VERSION} # TODO remove module files not matching an existing driver package. fi } diff --git a/vgpu-manager/ubuntu22.04/nvidia-driver b/vgpu-manager/ubuntu22.04/nvidia-driver index 216f10c98..1884d7985 100755 --- a/vgpu-manager/ubuntu22.04/nvidia-driver +++ b/vgpu-manager/ubuntu22.04/nvidia-driver @@ -65,13 +65,13 @@ _install_prerequisites() { mkdir -p /lib/modules/${KERNEL_VERSION}/proc echo "Installing Linux kernel headers..." - apt-get -qq install --no-install-recommends linux-headers-${KERNEL_VERSION} > /dev/null + apt-get install -y --no-install-recommends linux-headers-${KERNEL_VERSION} echo "Installing Linux kernel module files..." - apt-get -qq download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . - { apt-get -qq download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } 2> /dev/null + apt-get download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . + { apt-get download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } # linux-modules-extra contains pci-pf-stub which is required when enabling SR-IOV on a physical GPU - { apt-get -qq download linux-modules-extra-${KERNEL_VERSION} && dpkg -x linux-modules-extra*.deb . || true; } 2> /dev/null + { apt-get download linux-modules-extra-${KERNEL_VERSION} && dpkg -x linux-modules-extra*.deb . || true; } mv lib/modules/${KERNEL_VERSION}/modules.* /lib/modules/${KERNEL_VERSION} mv lib/modules/${KERNEL_VERSION}/kernel /lib/modules/${KERNEL_VERSION} depmod ${KERNEL_VERSION} @@ -89,7 +89,7 @@ _install_prerequisites() { # Cleanup the prerequisites installed above. _remove_prerequisites() { if [ "${PACKAGE_TAG:-}" != "builtin" ]; then - apt-get -qq purge linux-headers-${KERNEL_VERSION} > /dev/null + apt-get purge -y linux-headers-${KERNEL_VERSION} # TODO remove module files not matching an existing driver package. fi } diff --git a/vgpu-manager/ubuntu24.04/nvidia-driver b/vgpu-manager/ubuntu24.04/nvidia-driver index b09734dc8..ca65b40a7 100644 --- a/vgpu-manager/ubuntu24.04/nvidia-driver +++ b/vgpu-manager/ubuntu24.04/nvidia-driver @@ -65,13 +65,13 @@ _install_prerequisites() { mkdir -p /lib/modules/${KERNEL_VERSION}/proc echo "Installing Linux kernel headers..." - apt-get -qq install --no-install-recommends linux-headers-${KERNEL_VERSION} > /dev/null + apt-get install -y --no-install-recommends linux-headers-${KERNEL_VERSION} echo "Installing Linux kernel module files..." - apt-get -qq download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . - { apt-get -qq download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } 2> /dev/null + apt-get download linux-image-${KERNEL_VERSION} && dpkg -x linux-image*.deb . + { apt-get download linux-modules-${KERNEL_VERSION} && dpkg -x linux-modules*.deb . || true; } # linux-modules-extra contains pci-pf-stub which is required when enabling SR-IOV on a physical GPU - { apt-get -qq download linux-modules-extra-${KERNEL_VERSION} && dpkg -x linux-modules-extra*.deb . || true; } 2> /dev/null + { apt-get download linux-modules-extra-${KERNEL_VERSION} && dpkg -x linux-modules-extra*.deb . || true; } mv lib/modules/${KERNEL_VERSION}/modules.* /lib/modules/${KERNEL_VERSION} mv lib/modules/${KERNEL_VERSION}/kernel /lib/modules/${KERNEL_VERSION} depmod ${KERNEL_VERSION} @@ -89,7 +89,7 @@ _install_prerequisites() { # Cleanup the prerequisites installed above. _remove_prerequisites() { if [ "${PACKAGE_TAG:-}" != "builtin" ]; then - apt-get -qq purge linux-headers-${KERNEL_VERSION} > /dev/null + apt-get purge -y linux-headers-${KERNEL_VERSION} # TODO remove module files not matching an existing driver package. fi }