From bd9992be29c5fa5b5a47e67d2dbd250b9a5a8828 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 14 May 2021 21:22:30 -0400 Subject: Don't list __init__.py files in profile list --- archinstall/lib/profiles.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 9225a129..42fd4c24 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -26,6 +26,8 @@ def list_profiles(filter_irrelevant_macs=True, subpath='', filter_top_level_prof for PATH_ITEM in storage['PROFILE_PATH']: for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+subpath))): for file in files: + if file == '__init__.py': + continue if os.path.splitext(file)[1] == '.py': tailored = False if len(mac := re.findall('(([a-zA-z0-9]{2}[-:]){5}([a-zA-z0-9]{2}))', file)): -- cgit v1.2.3-70-g09d2 From 60858634f1afb2b1d5bcc0fbb9e4b0bccdedc876 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 14 May 2021 22:39:23 -0400 Subject: Fix microcode not getting added to base_packages before install Update installer.py --- archinstall/lib/installer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 03b49f77..68d058f0 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -320,12 +320,9 @@ class Installer(): if 'encrypt' not in self.HOOKS: self.HOOKS.insert(self.HOOKS.index('filesystems'), 'encrypt') - if not(hasUEFI()): # TODO: Allow for grub even on EFI + if not(hasUEFI()): self.base_packages.append('grub') - self.pacstrap(self.base_packages) - self.helper_flags['base-strapped'] = True - #self.genfstab() if not isVM(): vendor = cpuVendor() if vendor == "AuthenticAMD": @@ -334,6 +331,10 @@ class Installer(): self.base_packages.append("intel-ucode") else: self.log("Unknown cpu vendor not installing ucode") + + self.pacstrap(self.base_packages) + self.helper_flags['base-strapped'] = True + with open(f"{self.target}/etc/fstab", "a") as fstab: fstab.write( "\ntmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0\n" -- cgit v1.2.3-70-g09d2 From ea46693608a8f3e4a21325a8d65d2c2d78b83c69 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 14 May 2021 23:04:26 -0400 Subject: Add deepin to desktop profile list so it is selectable --- profiles/desktop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/desktop.py b/profiles/desktop.py index d4c13239..eca8803e 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -16,7 +16,7 @@ def _prep_function(*args, **kwargs): for more input before any other installer steps start. """ - supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate'] + supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate', 'deepin'] desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) -- cgit v1.2.3-70-g09d2