RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.github/workflows/iso-build.yaml vendored
View File

@ -9,12 +9,12 @@ on:
- main # In case we adopt this convention in the future - main # In case we adopt this convention in the future
pull_request: pull_request:
paths-ignore: paths-ignore:
- 'docs/**' - 'docs/**'
- '**.editorconfig' - '**.editorconfig'
- '**.gitignore' - '**.gitignore'
- '**.md' - '**.md'
- 'LICENSE' - 'LICENSE'
- 'PKGBUILD' - 'PKGBUILD'
jobs: jobs:
build: build:
@ -23,22 +23,22 @@ jobs:
image: archlinux:latest image: archlinux:latest
options: --privileged options: --privileged
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: pwd - run: pwd
- run: find . - run: find .
- run: cat /etc/os-release - run: cat /etc/os-release
- run: mkdir -p /tmp/archlive/airootfs/root/archinstall-git; cp -r . /tmp/archlive/airootfs/root/archinstall-git - run: mkdir -p /tmp/archlive/airootfs/root/archinstall-git; cp -r . /tmp/archlive/airootfs/root/archinstall-git
- run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install" > /tmp/archlive/airootfs/root/.zprofile - run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install" > /tmp/archlive/airootfs/root/.zprofile
- run: echo "echo \"This is an unofficial ISO for development and testing of archinstall. No support will be provided.\"" >> /tmp/archlive/airootfs/root/.zprofile - run: echo "echo \"This is an unofficial ISO for development and testing of archinstall. No support will be provided.\"" >> /tmp/archlive/airootfs/root/.zprofile
- run: echo "echo \"This ISO was built from Git SHA $GITHUB_SHA\"" >> /tmp/archlive/airootfs/root/.zprofile - run: echo "echo \"This ISO was built from Git SHA $GITHUB_SHA\"" >> /tmp/archlive/airootfs/root/.zprofile
- run: echo "echo \"Type archinstall to launch the installer.\"" >> /tmp/archlive/airootfs/root/.zprofile - run: echo "echo \"Type archinstall to launch the installer.\"" >> /tmp/archlive/airootfs/root/.zprofile
- run: cat /tmp/archlive/airootfs/root/.zprofile - run: cat /tmp/archlive/airootfs/root/.zprofile
- run: pacman -Sy; pacman --noconfirm -S git archiso - run: pacman -Sy; pacman --noconfirm -S git archiso
- run: cp -r /usr/share/archiso/configs/releng/* /tmp/archlive - run: cp -r /usr/share/archiso/configs/releng/* /tmp/archlive
- run: echo -e "git\npython\npython-pip\npython-setuptools" >> /tmp/archlive/packages.x86_64 - run: echo -e "git\npython\npython-pip\npython-setuptools" >> /tmp/archlive/packages.x86_64
- run: find /tmp/archlive - run: find /tmp/archlive
- run: cd /tmp/archlive; mkarchiso -v -w work/ -o out/ ./ - run: cd /tmp/archlive; mkarchiso -v -w work/ -o out/ ./
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: Arch Live ISO name: Arch Live ISO
path: /tmp/archlive/out/*.iso path: /tmp/archlive/out/*.iso

2
.github/workflows/lint-python.yaml vendored
View File

@ -1,4 +1,4 @@
on: [push, pull_request] on: [ push, pull_request ]
name: Lint Python and Find Syntax Errors name: Lint Python and Find Syntax Errors
jobs: jobs:
mypy: mypy:

32
.github/workflows/python-publish.yml vendored
View File

@ -5,7 +5,7 @@ name: Upload archinstall to PyPi
on: on:
release: release:
types: [created, published] types: [ created, published ]
jobs: jobs:
deploy: deploy:
@ -13,18 +13,18 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install setuptools wheel flit pip install setuptools wheel flit
- name: Build and publish - name: Build and publish
env: env:
FLIT_USERNAME: ${{ secrets.PYPI_USERNAME }} FLIT_USERNAME: ${{ secrets.PYPI_USERNAME }}
FLIT_PASSWORD: ${{ secrets.PYPI_PASSWORD }} FLIT_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: | run: |
flit publish flit publish

2
archinstall/__main__.py
View File

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

58
archinstall/lib/hardware.py
View File

@ -7,17 +7,17 @@ from .general import sys_command
from .networking import list_interfaces, enrich_iface_types from .networking import list_interfaces, enrich_iface_types
__packages__ = [ __packages__ = [
"mesa", "mesa",
"xf86-video-amdgpu", "xf86-video-amdgpu",
"xf86-video-ati", "xf86-video-ati",
"xf86-video-nouveau", "xf86-video-nouveau",
"xf86-video-vmware", "xf86-video-vmware",
"libva-mesa-driver", "libva-mesa-driver",
"libva-intel-driver", "libva-intel-driver",
"intel-media-driver", "intel-media-driver",
"vulkan-radeon", "vulkan-radeon",
"vulkan-intel", "vulkan-intel",
"nvidia", "nvidia",
] ]
AVAILABLE_GFX_DRIVERS = { AVAILABLE_GFX_DRIVERS = {
@ -55,47 +55,57 @@ AVAILABLE_GFX_DRIVERS = {
"VMware / VirtualBox (open-source)": ["mesa", "xf86-video-vmware"], "VMware / VirtualBox (open-source)": ["mesa", "xf86-video-vmware"],
} }
def hasWifi()->bool:
def hasWifi() -> bool:
return 'WIRELESS' in enrich_iface_types(list_interfaces().values()).values() return 'WIRELESS' in enrich_iface_types(list_interfaces().values()).values()
def hasAMDCPU()->bool:
def hasAMDCPU() -> bool:
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode(): if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
return True return True
return False return False
def hasIntelCPU()->bool:
def hasIntelCPU() -> bool:
if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode(): if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode():
return True return True
return False return False
def hasUEFI()->bool:
def hasUEFI() -> bool:
return os.path.isdir('/sys/firmware/efi') return os.path.isdir('/sys/firmware/efi')
def graphicsDevices()->dict:
def graphicsDevices() -> dict:
cards = {} cards = {}
for line in sys_command(f"lspci"): for line in sys_command(f"lspci"):
if b' VGA ' in line: if b' VGA ' in line:
_, identifier = line.split(b': ',1) _, identifier = line.split(b': ', 1)
cards[identifier.strip().lower().decode('UTF-8')] = line cards[identifier.strip().lower().decode('UTF-8')] = line
return cards return cards
def hasNvidiaGraphics()->bool:
def hasNvidiaGraphics() -> bool:
return any('nvidia' in x for x in graphicsDevices()) return any('nvidia' in x for x in graphicsDevices())
def hasAmdGraphics()->bool:
def hasAmdGraphics() -> bool:
return any('amd' in x for x in graphicsDevices()) return any('amd' in x for x in graphicsDevices())
def hasIntelGraphics()->bool:
def hasIntelGraphics() -> bool:
return any('intel' in x for x in graphicsDevices()) return any('intel' in x for x in graphicsDevices())
def cpuVendor()-> Optional[str]: def cpuVendor() -> Optional[str]:
cpu_info = json.loads(subprocess.check_output("lscpu -J", shell=True).decode('utf-8'))['lscpu'] cpu_info = json.loads(subprocess.check_output("lscpu -J", shell=True).decode('utf-8'))['lscpu']
for info in cpu_info: for info in cpu_info:
if info.get('field',None): if info.get('field', None):
if info.get('field',None) == "Vendor ID:": if info.get('field', None) == "Vendor ID:":
return info.get('data',None) return info.get('data', None)
return None return None
def isVM() -> bool: def isVM() -> bool:
try: try:
subprocess.check_call(["systemd-detect-virt"]) # systemd-detect-virt issues a non-zero exit code if it is not on a virtual machine subprocess.check_call(["systemd-detect-virt"]) # systemd-detect-virt issues a non-zero exit code if it is not on a virtual machine

46
archinstall/lib/installer.py
View File

@ -1,8 +1,6 @@
from .disk import * from .disk import *
from .hardware import * from .hardware import *
from .mirrors import * from .mirrors import *
from .output import log
from .profiles import Profile
from .storage import storage from .storage import storage
from .systemd import Networkd from .systemd import Networkd
from .user_interaction import * 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) # 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"] __packages__ = ["base", "base-devel", "linux-firmware", "linux", "linux-lts", "linux-zen", "linux-hardened"]
class Installer(): class Installer():
""" """
`Installer()` is the wrapper for most basic installation steps. `Installer()` is the wrapper for most basic installation steps.
@ -34,14 +33,15 @@ class Installer():
:type hostname: str, optional :type hostname: str, optional
""" """
def __init__(self, target, *, base_packages=__packages__[:3], kernels=['linux']): def __init__(self, target, *, base_packages=__packages__[:3], kernels=['linux']):
self.target = target self.target = target
self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S') self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
self.milliseconds = int(str(time.time()).split('.')[1]) self.milliseconds = int(str(time.time()).split('.')[1])
self.helper_flags = { self.helper_flags = {
'base' : False, 'base': False,
'bootloader' : False 'bootloader': False
} }
self.base_packages = base_packages.split(' ') if type(base_packages) is str else base_packages self.base_packages = base_packages.split(' ') if type(base_packages) is str else base_packages
@ -74,7 +74,7 @@ class Installer():
# TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager # TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager
if len(args) >= 2 and args[1]: if len(args) >= 2 and args[1]:
#self.log(self.trace_log.decode('UTF-8'), level=logging.DEBUG) # self.log(self.trace_log.decode('UTF-8'), level=logging.DEBUG)
self.log(args[1], level=logging.ERROR, fg='red') self.log(args[1], level=logging.ERROR, fg='red')
self.sync_log_to_install_medium() self.sync_log_to_install_medium()
@ -169,10 +169,10 @@ class Installer():
def set_timezone(self, zone, *args, **kwargs): def set_timezone(self, zone, *args, **kwargs):
if not zone: return True if not zone: return True
if not len(zone): return True # Redundant if not len(zone): return True # Redundant
if (pathlib.Path("/usr")/"share"/"zoneinfo"/zone).exists(): if (pathlib.Path("/usr") / "share" / "zoneinfo" / zone).exists():
(pathlib.Path(self.target)/"etc"/"localtime").unlink(missing_ok=True) (pathlib.Path(self.target) / "etc" / "localtime").unlink(missing_ok=True)
sys_command(f'/usr/bin/arch-chroot {self.target} ln -s /usr/share/zoneinfo/{zone} /etc/localtime') sys_command(f'/usr/bin/arch-chroot {self.target} ln -s /usr/share/zoneinfo/{zone} /etc/localtime')
return True return True
else: else:
@ -235,6 +235,7 @@ class Installer():
# If we haven't installed the base yet (function called pre-maturely) # If we haven't installed the base yet (function called pre-maturely)
if self.helper_flags.get('base', False) is False: if self.helper_flags.get('base', False) is False:
self.base_packages.append('iwd') self.base_packages.append('iwd')
# This function will be called after minimal_installation() # This function will be called after minimal_installation()
# as a hook for post-installs. This hook is only needed if # as a hook for post-installs. This hook is only needed if
# base is not installed yet. # base is not installed yet.
@ -264,18 +265,19 @@ class Installer():
if self.helper_flags.get('base', False) is False: if self.helper_flags.get('base', False) is False:
def post_install_enable_networkd_resolved(*args, **kwargs): def post_install_enable_networkd_resolved(*args, **kwargs):
self.enable_service('systemd-networkd', 'systemd-resolved') self.enable_service('systemd-networkd', 'systemd-resolved')
self.post_base_install.append(post_install_enable_networkd_resolved) self.post_base_install.append(post_install_enable_networkd_resolved)
# Otherwise, we can go ahead and enable the services # Otherwise, we can go ahead and enable the services
else: else:
self.enable_service('systemd-networkd', 'systemd-resolved') self.enable_service('systemd-networkd', 'systemd-resolved')
return True return True
def detect_encryption(self, partition): def detect_encryption(self, partition):
if partition.encrypted: if partition.encrypted:
return partition 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 Partition(partition.parent, None, autodetect_filesystem=True)
return False return False
@ -294,11 +296,9 @@ class Installer():
## TODO: Perhaps this should be living in the function which dictates ## TODO: Perhaps this should be living in the function which dictates
## the partitioning. Leaving here for now. ## the partitioning. Leaving here for now.
for partition in self.partitions: for partition in self.partitions:
if partition.filesystem == 'btrfs': if partition.filesystem == 'btrfs':
#if partition.encrypted: # if partition.encrypted:
self.base_packages.append('btrfs-progs') self.base_packages.append('btrfs-progs')
if partition.filesystem == 'xfs': if partition.filesystem == 'xfs':
self.base_packages.append('xfsprogs') self.base_packages.append('xfsprogs')
@ -316,12 +316,12 @@ class Installer():
if 'encrypt' not in self.HOOKS: if 'encrypt' not in self.HOOKS:
self.HOOKS.insert(self.HOOKS.index('filesystems'), 'encrypt') self.HOOKS.insert(self.HOOKS.index('filesystems'), 'encrypt')
if not(hasUEFI()): if not (hasUEFI()):
self.base_packages.append('grub') self.base_packages.append('grub')
if not isVM(): if not isVM():
vendor = cpuVendor() vendor = cpuVendor()
if vendor == "AuthenticAMD": if vendor == "AuthenticAMD":
self.base_packages.append("amd-ucode") self.base_packages.append("amd-ucode")
elif vendor == "GenuineIntel": elif vendor == "GenuineIntel":
self.base_packages.append("intel-ucode") self.base_packages.append("intel-ucode")
@ -337,9 +337,9 @@ class Installer():
) # Redundant \n at the start? who knows? ) # Redundant \n at the start? who knows?
## TODO: Support locale and timezone ## TODO: Support locale and timezone
#os.remove(f'{self.target}/etc/localtime') # os.remove(f'{self.target}/etc/localtime')
#sys_command(f'/usr/bin/arch-chroot {self.target} ln -s /usr/share/zoneinfo/{localtime} /etc/localtime') # sys_command(f'/usr/bin/arch-chroot {self.target} ln -s /usr/share/zoneinfo/{localtime} /etc/localtime')
#sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime') # sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime')
self.set_hostname('archinstall') self.set_hostname('archinstall')
self.set_locale('en_US') self.set_locale('en_US')
@ -361,7 +361,7 @@ class Installer():
boot_partition = None boot_partition = None
root_partition = None root_partition = None
for partition in self.partitions: for partition in self.partitions:
if partition.mountpoint == self.target+'/boot': if partition.mountpoint == self.target + '/boot':
boot_partition = partition boot_partition = partition
elif partition.mountpoint == self.target: elif partition.mountpoint == self.target:
root_partition = partition root_partition = partition
@ -404,7 +404,7 @@ class Installer():
## For some reason, blkid and /dev/disk/by-uuid are not getting along well. ## For some reason, blkid and /dev/disk/by-uuid are not getting along well.
## And blkid is wrong in terms of LUKS. ## And blkid is wrong in terms of LUKS.
#UUID = sys_command('blkid -s PARTUUID -o value {drive}{partition_2}'.format(**args)).decode('UTF-8').strip() # UUID = sys_command('blkid -s PARTUUID -o value {drive}{partition_2}'.format(**args)).decode('UTF-8').strip()
# Setup the loader entry # Setup the loader entry
with open(f'{self.target}/boot/loader/entries/{self.init_time}.conf', 'w') as entry: with open(f'{self.target}/boot/loader/entries/{self.init_time}.conf', 'w') as entry:
entry.write(f'# Created by: archinstall\n') entry.write(f'# Created by: archinstall\n')
@ -413,7 +413,7 @@ class Installer():
entry.write(f'linux /vmlinuz-linux\n') entry.write(f'linux /vmlinuz-linux\n')
if not isVM(): if not isVM():
vendor = cpuVendor() vendor = cpuVendor()
if vendor == "AuthenticAMD": if vendor == "AuthenticAMD":
entry.write("initrd /amd-ucode.img\n") entry.write("initrd /amd-ucode.img\n")
elif vendor == "GenuineIntel": elif vendor == "GenuineIntel":
entry.write("initrd /intel-ucode.img\n") entry.write("initrd /intel-ucode.img\n")
@ -468,13 +468,13 @@ class Installer():
self.log(f'Installing network profile {profile}', level=logging.INFO) self.log(f'Installing network profile {profile}', level=logging.INFO)
return profile.install() return profile.install()
def enable_sudo(self, entity :str, group=False): def enable_sudo(self, entity: str, group=False):
self.log(f'Enabling sudo permissions for {entity}.', level=logging.INFO) self.log(f'Enabling sudo permissions for {entity}.', level=logging.INFO)
with open(f'{self.target}/etc/sudoers', 'a') as sudoers: with open(f'{self.target}/etc/sudoers', 'a') as sudoers:
sudoers.write(f'{"%" if group else ""}{entity} ALL=(ALL) ALL\n') sudoers.write(f'{"%" if group else ""}{entity} ALL=(ALL) ALL\n')
return True return True
def user_create(self, user :str, password=None, groups=[], sudo=False): def user_create(self, user: str, password=None, groups=[], sudo=False):
self.log(f'Creating user {user}', level=logging.INFO) self.log(f'Creating user {user}', level=logging.INFO)
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.target} useradd -m -G wheel {user}')) o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.target} useradd -m -G wheel {user}'))
if password: if password:

4
archinstall/lib/locale_helpers.py
View File

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