Merge ~oem-solutions-group/pc-enablement/+git/oem-volatile-task-sutton:lp1996170 into ~oem-solutions-group/pc-enablement/+git/oem-volatile-task-sutton:main

[jeremyszu]

Workaround config made by nvidia-prime (LP: #1996170)

+# Usage (FIXME: LP: #1996170)
+# Workaround nvidia-prime installed in live session but rootfs. Which causes
+# some configurations (e.g. /etc/prime-discrete) in preinst won't be referred.
+# In stock ubuntu, there is also a workaround to copy configurations.
+#
+# Please refer package "ubuntu-drivers-common" file
+# "ubiquity/target-config/31ubuntu_driver_packages" for mode details.
+workaround_ubiquity_nvidia_configuration()
+{
+ # /lib/modprobe.d/nvidia-kms.conf
+ # /etc/prime-discrete
+ # XXX: the on-demand mode is the default mode.
+ test -f $(which prime-select) && prime-select on-demane
+ # or test -f $(which prime-select) && prime-select $(prime-select query)
+
+ # /run/nvidia_runtimepm_supported
+ # which is covered by `ubuntu-drivers install` in install_oem_packages()
+}

[Andy Chi (andch)]

Waiting the new image build to test.

review: Needs Information

[Bin Li (binli)]

Currently we didn't meet this issue on sutton, should we apply this to sutton project?

If there is no harm to sutton, I'm fine with it. Let's wait Andy's test.

Unmerged commits

abc95f7... by jeremyszu on 2022-11-13

Workaround config made by nvidia-prime (LP: #1996170)

diff --git a/task/35_workaround_ubiquity_nvidia_config b/task/35_workaround_ubiquity_nvidia_config
new file mode 100755
index 0000000..1265969
--- /dev/null
+++ b/task/35_workaround_ubiquity_nvidia_config
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -x
+
+# shellcheck source=/dev/null
+. /usr/share/volatile/common.sh
+
+# Workaround config made by nvidia-prime (LP: #1996170)
+workaround_ubiquity_nvidia_configuration