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

added support to automatically add ucode to initrd

This commit is contained in:
advaithm 2021-04-07 17:21:31 +05:30
parent d9480ee8a0
commit 36bad8254f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archinstall/lib/installer.py
View File

@ -9,7 +9,7 @@ from .mirrors import *
from .systemd import Networkd from .systemd import Networkd
from .output import log, LOG_LEVELS from .output import log, LOG_LEVELS
from .storage import storage from .storage import storage
from .hardware 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", "linux-firmware", "efibootmgr", "nano", "ntp", "iwd"] __packages__ = ["base", "base-devel", "linux", "linux-firmware", "efibootmgr", "nano", "ntp", "iwd"]
__base_packages__ = __packages__[:6] __base_packages__ = __packages__[:6]
@ -288,7 +288,14 @@ class Installer():
self.pacstrap(self.base_packages) self.pacstrap(self.base_packages)
self.helper_flags['base-strapped'] = True self.helper_flags['base-strapped'] = True
#self.genfstab() #self.genfstab()
if not isVM():
vendor = cpuVendor()
if vendor == "AuthenticAMD":
self.base_packages.append("amd-ucode")
elif vendor == "GenuineIntel":
self.base_packages.append("intel-ucode")
else:
self.log("unknown cpu vendor not installing ucode")
with open(f"{self.mountpoint}/etc/fstab", "a") as fstab: with open(f"{self.mountpoint}/etc/fstab", "a") as fstab:
fstab.write( fstab.write(
"\ntmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0\n" "\ntmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0\n"
@ -364,13 +371,20 @@ 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.mountpoint}/boot/loader/entries/{self.init_time}.conf', 'w') as entry: with open(f'{self.mountpoint}/boot/loader/entries/{self.init_time}.conf', 'w') as entry:
entry.write(f'# Created by: archinstall\n') entry.write(f'# Created by: archinstall\n')
entry.write(f'# Created on: {self.init_time}\n') entry.write(f'# Created on: {self.init_time}\n')
entry.write(f'title Arch Linux\n') entry.write(f'title Arch Linux\n')
entry.write(f'linux /vmlinuz-linux\n') entry.write(f'linux /vmlinuz-linux\n')
if not isVM():
vendor = cpuVendor()
if vendor == "AuthenticAMD":
entry.write("initrd /amd-ucode.img")
elif vendor == "GenuineIntel":
entry.write("initrd /amd-ucode.img")
else:
self.log("unknow cpu vendor, not adding ucode to systemd-boot config")
entry.write(f'initrd /initramfs-linux.img\n') entry.write(f'initrd /initramfs-linux.img\n')
## blkid doesn't trigger on loopback devices really well, ## blkid doesn't trigger on loopback devices really well,
## so we'll use the old manual method until we get that sorted out. ## so we'll use the old manual method until we get that sorted out.