index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2021-05-15 09:47:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-15 09:47:05 +0000 |
commit | 2ebf92e5fa27c9d26b2ed674d9cb86291c45a94a (patch) | |
tree | 815b7a3f760a6048311082306a148d010b5bb09c /archinstall | |
parent | c27445d1344583c2f79866f85f46c997b305e1d6 (diff) | |
parent | 935cdef63fbefb6125043f9bda254d532a6fc03e (diff) |
-rw-r--r-- | archinstall/lib/installer.py | 9 | ||||
-rw-r--r-- | archinstall/lib/profiles.py | 2 |
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" 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)): |