Merge pull request #62 from t0xic0der/prime-config

gridhead · web-flow · commit 1037fcd6de91 · 2021-05-22T20:34:31.000+05:30
Added option to enable/disable PRIME support on Optimus-supported devices
diff --git a/nvautoinstall.spec b/nvautoinstall.spec
@@ -1,7 +1,7 @@
 %global srcname nvidia-auto-installer-for-fedora
 
 Name: nvautoinstall
-Version: 0.3.6
+Version: 0.3.7
 Release: 0%{?dist}
 Summary: NVIDIA Auto Installer for Fedora
 
@@ -36,10 +36,17 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 
 #-- CHANGELOG -----------------------------------------------------------------#
 %changelog
+
+* Sat May 22 2021 Akashdeep Dhar <t0xic0der@fedoraproject.org>
+- v0.3.7
+- Added option to enable/disable PRIME support on Optimus-supported devices
+- Added other miscellaneous changes for ease of maintenance
+
 * Sun May 09 2021 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.3.6
 - Reworked installation method for CUDA repo compatibility
 - Minor patch leading to a version bump
+
 * Thu Apr 29 2021 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.3.5
 - Corrected unicode escape sequences for colors
@@ -48,6 +55,7 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Refactored the code to remove needless lines
 - Made compliance related changes here and there
 - Tested and confirmed the tool to be working in F34 Workstation
+
 * Thu Jun 04 2020 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.3.0
 - Combined RPM Fusion pinging, checking, installing into a single module
@@ -67,11 +75,13 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Added checks for NVIDIA repository and RPM Fusion repository availability
 - Added network availability check before pinging respective repo servers
 - Improved handling of interrupt. halt and suspend system calls for tool
+
 * Mon Jun 01 2020 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.2.6
 - Fixed broken repository addition module
 - Added installation of fedora-workstation-repositories first
 - Added enabling of repository after the install is complete
+
 * Sun May 31 2020 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.2.5
 - Removed mandatory sleep for kernel module load
@@ -81,6 +91,7 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Fixed boolean choices in main function
 - Fixed boolean choices in package check
 - Fixed prompt colors for custom-themed terminals
+
 * Wed May 27 2020 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.2.0
 - Cleaned up repeated code using class implemented decorator calls
@@ -92,6 +103,7 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Added dedicated status check for kernel module reader
 - Fixed confirmation choice during package check
 - Fixed typo in RPM Fusion mentions throughout the tool interface
+
 * Fri May 22 2020 Akashdeep Dhar <t0xic0der@fedoraproject.org>
 - v0.1.0
 - Added host detection with display of system details and hostname
diff --git a/src/nvautoinstall/MainFunction.py b/src/nvautoinstall/MainFunction.py
@@ -1,3 +1,24 @@
+"""
+##########################################################################
+*
+*   Copyright © 2019-2021 Akashdeep Dhar <t0xic0der@fedoraproject.org>
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+##########################################################################
+"""
+
 import os
 import subprocess
 import sys
@@ -179,6 +200,23 @@ def main(self):
         return data == 0
 
 
+class CollPrimeSupportEnabler(object):
+    def main(self, opts):
+        try:
+            with open("/usr/share/X11/xorg.conf.d/nvidia.conf", "r") as sharconf:
+                shardata = sharconf.read()
+            primemod = ""
+            for indx in shardata.split("\n"):
+                primemod += indx + "\n"
+                if opts is True and indx == "\tOption \"BaseMosaic\" \"on\"":
+                    primemod += "\tOption \"PrimaryGPU\" \"yes\"" + "\n"
+            with open("/etc/X11/xorg.conf.d/nvidia.conf", "w") as etcdconf:
+                etcdconf.write(primemod)
+            return True
+        except Exception:
+            return False
+
+
 SupportCheck = CollSupportCheck()
 RPMFHandler = CollRPMFHandler()
 DriverInstaller = CollDriverInstaller()
@@ -188,6 +226,7 @@ def main(self):
 VidAccInstaller = CollVidAccInstaller()
 VulkanInstaller = CollVulkanInstaller()
 SuperuserCheck = CollSuperuserCheck()
+PrimeSupportEnabler = CollPrimeSupportEnabler()
 
 
 class InstallationMode(object):
@@ -204,6 +243,7 @@ def __init__(self):
             "--getall " : "This mode installs all the above packages.",
             "--cheksu " : "This mode allows you to check the user privilege level.",
             "--compat " : "This mode allows you to check your compatibility.",
+            "--primec " : "This mode allows you to setup PRIME configuration.",
             "--version" : "Show the version and exit.",
             "--help   " : "Show this message and exit.",
         }
@@ -555,6 +595,56 @@ def compat(self):
         DecoratorObject.failure_message("Leaving installer")
         sys.exit(0)
 
+    def primec(self):
+        DecoratorObject.section_heading("CHECKING SUPERUSER PERMISSIONS...")
+        if SuperuserCheck.main():
+            DecoratorObject.success_message("Superuser privilege acquired")
+            DecoratorObject.section_heading("CHECKING AVAILABILITY OF RPM FUSION NVIDIA REPOSITORY...")
+            if RPMFHandler.avbl():
+                DecoratorObject.warning_message("RPM Fusion repository for Proprietary NVIDIA Driver was detected")
+                DecoratorObject.section_heading("ATTEMPTING CONNECTION TO RPM FUSION SERVERS...")
+                if RPMFHandler.conn():
+                    DecoratorObject.success_message("Connection to RPM Fusion servers was established")
+                    DecoratorObject.section_heading("LOOKING FOR EXISTING DRIVER PACKAGES...")
+                    data = DriverInstaller.avbl()
+                    if data is False:
+                        DecoratorObject.failure_message("No existing NVIDIA driver packages were detected")
+                    else:
+                        qant = 0
+                        for indx in data:
+                            if indx != "":
+                                qant += 1
+                                DecoratorObject.general_message(indx)
+                        DecoratorObject.warning_message("A total of " + str(qant) + " driver packages were detected")
+                        DecoratorObject.section_heading("SETTING UP PRIME SUPPORT...")
+                        DecoratorObject.warning_message("Intervention required")
+                        DecoratorObject.general_message(click.style("< Y >", fg="green", bold=True) + " to enable PRIME support")
+                        DecoratorObject.general_message(click.style("< N >", fg="red", bold=True) + " to disable PRIME support")
+                        DecoratorObject.general_message(click.style("< * >", fg="yellow", bold=True) + " anything else to leave")
+                        solution = input("[Y/N] ")
+                        if solution == "Y" or solution == "y":
+                            DecoratorObject.section_heading("ENABLING PRIME SUPPORT...")
+                            if PrimeSupportEnabler.main(True):
+                                DecoratorObject.success_message("PRIME Support was successfully enabled")
+                            else:
+                                DecoratorObject.failure_message("PRIME Support could not be enabled")
+                        elif solution == "N" or solution == "n":
+                            DecoratorObject.section_heading("DISABLING PRIME SUPPORT...")
+                            if PrimeSupportEnabler.main(False):
+                                DecoratorObject.success_message("PRIME Support was successfully disabled")
+                            else:
+                                DecoratorObject.failure_message("PRIME Support could not be disabled")
+                        else:
+                            DecoratorObject.section_heading("SAFE AND GOOD ANSWER...")
+                else:
+                    DecoratorObject.failure_message("Connection to RPM Fusion servers could not be established")
+            else:
+                DecoratorObject.failure_message("RPM Fusion repository for Proprietary NVIDIA Driver was not detected")
+        else:
+            DecoratorObject.failure_message("Superuser privilege could not be acquired")
+        DecoratorObject.failure_message("Leaving installer")
+        sys.exit(0)
+
     def lsmenu(self):
         DecoratorObject.section_heading("OPTIONS")
         for indx in self.menudict.keys():
@@ -563,33 +653,115 @@ def lsmenu(self):
 
 
 @click.command()
-@click.option("--rpmadd", "instmode", flag_value="rpmadd", help="This mode enables the RPM Fusion NVIDIA drivers repository")
-@click.option("--driver", "instmode", flag_value="driver", help="This mode simply installs the NVIDIA driver")
-@click.option("--x86lib", "instmode", flag_value="x86lib", help="This mode installs only the x86 libraries for Xorg")
-@click.option("--nvrepo", "instmode", flag_value="nvrepo", help="This mode enables the Official NVIDIA repository for CUDA")
-@click.option("--plcuda", "instmode", flag_value="plcuda", help="This mode installs only the CUDA support softwares")
-@click.option("--ffmpeg", "instmode", flag_value="ffmpeg", help="This mode installs only the FFMPEG acceleration")
-@click.option("--vulkan", "instmode", flag_value="vulkan", help="This mode installs only the Vulkan renderer")
-@click.option("--vidacc", "instmode", flag_value="vidacc", help="This mode installs only the VDPAU/VAAPI acceleration")
-@click.option("--getall", "instmode", flag_value="getall", help="This mode installs all the above packages")
-@click.option("--cheksu", "instmode", flag_value="cheksu", help="This mode allows you to check the user privilege level")
-@click.option("--compat", "instmode", flag_value="compat", help="This mode allows you to check your compatibility")
-@click.version_option(version=__version__, prog_name=click.style("NVAutoInstall by Akashdeep Dhar <t0xic0der@fedoraproject.org>", fg="green", bold=True))
+@click.option(
+    "--rpmadd",
+    "instmode",
+    flag_value="rpmadd",
+    help="This mode enables the RPM Fusion NVIDIA drivers repository."
+)
+@click.option(
+    "--driver",
+    "instmode",
+    flag_value="driver",
+    help="This mode simply installs the NVIDIA driver."
+)
+@click.option(
+    "--x86lib",
+    "instmode",
+    flag_value="x86lib",
+    help="This mode installs only the x86 libraries for Xorg."
+)
+@click.option(
+    "--nvrepo",
+    "instmode",
+    flag_value="nvrepo",
+    help="This mode enables the Official NVIDIA repository for CUDA."
+)
+@click.option(
+    "--plcuda",
+    "instmode",
+    flag_value="plcuda",
+    help="This mode installs only the CUDA support softwares."
+)
+@click.option(
+    "--ffmpeg",
+    "instmode",
+    flag_value="ffmpeg",
+    help="This mode installs only the FFMPEG acceleration."
+)
+@click.option(
+    "--vulkan",
+    "instmode",
+    flag_value="vulkan",
+    help="This mode installs only the Vulkan renderer."
+)
+@click.option(
+    "--vidacc",
+    "instmode",
+    flag_value="vidacc",
+    help="This mode installs only the VDPAU/VAAPI acceleration."
+)
+@click.option(
+    "--getall",
+    "instmode",
+    flag_value="getall",
+    help="This mode installs all the above packages."
+)
+@click.option(
+    "--cheksu",
+    "instmode",
+    flag_value="cheksu",
+    help="This mode allows you to check the user privilege level."
+)
+@click.option(
+    "--compat",
+    "instmode",
+    flag_value="compat",
+    help="This mode allows you to check your compatibility."
+)
+@click.option(
+    "--primec",
+    "instmode",
+    flag_value="primec",
+    help="This mode allows you to setup PRIME configuration."
+)
+@click.version_option(
+    version=__version__,
+    prog_name=click.style(
+        "NVAutoInstall by Akashdeep Dhar <t0xic0der@fedoraproject.org>",
+        fg="green",
+        bold=True
+    )
+)
 def clim(instmode):
     instobjc = InstallationMode()
     click.echo(click.style("[ # ] NVIDIA AUTOINSTALLER FOR FEDORA", fg="green", bold=True))
-    if instmode == "rpmadd":    instobjc.rpmadd()
-    elif instmode == "driver":  instobjc.driver()
-    elif instmode == "x86lib":  instobjc.x86lib()
-    elif instmode == "nvrepo":  instobjc.nvrepo()
-    elif instmode == "plcuda":  instobjc.plcuda()
-    elif instmode == "ffmpeg":  instobjc.ffmpeg()
-    elif instmode == "vulkan":  instobjc.vulkan()
-    elif instmode == "vidacc":  instobjc.vidacc()
-    elif instmode == "getall":  instobjc.getall()
-    elif instmode == "cheksu":  instobjc.cheksu()
-    elif instmode == "compat":  instobjc.compat()
-    else:                       instobjc.lsmenu()
+    if instmode == "rpmadd":
+        instobjc.rpmadd()
+    elif instmode == "driver":
+        instobjc.driver()
+    elif instmode == "x86lib":
+        instobjc.x86lib()
+    elif instmode == "nvrepo":
+        instobjc.nvrepo()
+    elif instmode == "plcuda":
+        instobjc.plcuda()
+    elif instmode == "ffmpeg":
+        instobjc.ffmpeg()
+    elif instmode == "vulkan":
+        instobjc.vulkan()
+    elif instmode == "vidacc":
+        instobjc.vidacc()
+    elif instmode == "getall":
+        instobjc.getall()
+    elif instmode == "cheksu":
+        instobjc.cheksu()
+    elif instmode == "compat":
+        instobjc.compat()
+    elif instmode == "primec":
+        instobjc.primec()
+    else:
+        instobjc.lsmenu()
 
 
 if __name__ == "__main__":
diff --git a/src/nvautoinstall/__init__.py b/src/nvautoinstall/__init__.py
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU General Public License
 # along with nvautoinstall.  If not, see <https://www.gnu.org/licenses/>.
 
-__version__ = '0.3.6'
+__version__ = "0.3.7"
