Corrected a error in the installation of iwd. The package was added to base_packages, which is never installed if the installer has already finished installing the base packages before this function was called. copy_ISO_network_config() there for now properly checks if the installation is complete and if so, simply straps in the package. Otherwise adds it to the base packages and waits for the base to roll through.

This commit is contained in:
Anton Hvornum 2021-01-26 00:11:17 +01:00
parent 405794d53f
commit a3d9ad9f3f
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 14 additions and 10 deletions

View File

@ -190,20 +190,24 @@ class Installer():
if not os.path.isdir(f"{self.mountpoint}/var/lib/iwd"):
os.makedirs(f"{self.mountpoint}/var/lib/iwd")
self.base_packages.append('iwd')
if enable_services:
# 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.
def post_install_enable_iwd_service(*args, **kwargs):
self.enable_service('iwd')
if enable_services and self.helper_flags.get('base', False) is False:
# 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.
def post_install_enable_iwd_service(*args, **kwargs):
self.post_base_install.append(post_install_enable_iwd_service)
# Otherwise, we can go ahead and add the required package
# and enable it's service:
else:
self.pacstrap(self.base_packages)
self.enable_service('iwd')
self.post_base_install.append(post_install_enable_iwd_service)
elif enable_services and self.helper_flags.get('base', False) is True:
self.enable_service('iwd')
for psk in psk_files:
shutil.copy2(psk, f"{self.mountpoint}/var/lib/iwd/{os.path.basename(psk)}")