Some additional formatting

This commit is contained in:
Dylan Taylor 2021-05-15 12:46:23 -04:00
parent 69d675f4aa
commit b2d20647fc
7 changed files with 102 additions and 92 deletions

View File

@ -1,6 +1,4 @@
import archinstall
import sys
import os
if __name__ == '__main__':
archinstall.run_as_a_module()

View File

@ -55,21 +55,27 @@ AVAILABLE_GFX_DRIVERS = {
"VMware / VirtualBox (open-source)": ["mesa", "xf86-video-vmware"],
}
def hasWifi() -> bool:
return 'WIRELESS' in enrich_iface_types(list_interfaces().values()).values()
def hasAMDCPU() -> bool:
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
return True
return False
def hasIntelCPU() -> bool:
if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode():
return True
return False
def hasUEFI() -> bool:
return os.path.isdir('/sys/firmware/efi')
def graphicsDevices() -> dict:
cards = {}
for line in sys_command(f"lspci"):
@ -78,12 +84,15 @@ def graphicsDevices()->dict:
cards[identifier.strip().lower().decode('UTF-8')] = line
return cards
def hasNvidiaGraphics() -> bool:
return any('nvidia' in x for x in graphicsDevices())
def hasAmdGraphics() -> bool:
return any('amd' in x for x in graphicsDevices())
def hasIntelGraphics() -> bool:
return any('intel' in x for x in graphicsDevices())
@ -96,6 +105,7 @@ def cpuVendor()-> Optional[str]:
return info.get('data', None)
return None
def isVM() -> bool:
try:
subprocess.check_call(["systemd-detect-virt"]) # systemd-detect-virt issues a non-zero exit code if it is not on a virtual machine

View File

@ -1,8 +1,6 @@
from .disk import *
from .hardware import *
from .mirrors import *
from .output import log
from .profiles import Profile
from .storage import storage
from .systemd import Networkd
from .user_interaction import *
@ -10,6 +8,7 @@ from .user_interaction import *
# Any package that the Installer() is responsible for (optional and the default ones)
__packages__ = ["base", "base-devel", "linux-firmware", "linux", "linux-lts", "linux-zen", "linux-hardened"]
class Installer():
"""
`Installer()` is the wrapper for most basic installation steps.
@ -34,6 +33,7 @@ class Installer():
:type hostname: str, optional
"""
def __init__(self, target, *, base_packages=__packages__[:3], kernels=['linux']):
self.target = target
self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
@ -235,6 +235,7 @@ class Installer():
# If we haven't installed the base yet (function called pre-maturely)
if self.helper_flags.get('base', False) is False:
self.base_packages.append('iwd')
# This function will be called after minimal_installation()
# as a hook for post-installs. This hook is only needed if
# base is not installed yet.
@ -264,18 +265,19 @@ class Installer():
if self.helper_flags.get('base', False) is False:
def post_install_enable_networkd_resolved(*args, **kwargs):
self.enable_service('systemd-networkd', 'systemd-resolved')
self.post_base_install.append(post_install_enable_networkd_resolved)
# Otherwise, we can go ahead and enable the services
else:
self.enable_service('systemd-networkd', 'systemd-resolved')
return True
def detect_encryption(self, partition):
if partition.encrypted:
return partition
elif partition.parent not in partition.path and Partition(partition.parent, None, autodetect_filesystem=True).filesystem == 'crypto_LUKS':
elif partition.parent not in partition.path and Partition(partition.parent, None,
autodetect_filesystem=True).filesystem == 'crypto_LUKS':
return Partition(partition.parent, None, autodetect_filesystem=True)
return False
@ -294,8 +296,6 @@ class Installer():
## TODO: Perhaps this should be living in the function which dictates
## the partitioning. Leaving here for now.
for partition in self.partitions:
if partition.filesystem == 'btrfs':
# if partition.encrypted:

View File

@ -1,7 +1,9 @@
import subprocess
import os
import subprocess
from .exceptions import *
# from .general import sys_command