kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 19:46:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(kernel-bootstrap): place pre-network distfiles back into init image paths

Browse source
This commit is contained in:
vxtls 2026-03-03 08:40:58 -05:00
parent 85c389044d
commit 95b25afdcd
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/generator.py
View file

@ -65,15 +65,21 @@ class Generator():
Select how kernel-bootstrap should transport distfiles. Select how kernel-bootstrap should transport distfiles.
""" """
if self.repo_path: if self.repo_path:
# Keep second-disk staging outside init image for ext3 repo mode.
self.external_dir = os.path.join(os.path.dirname(self.target_dir), 'external')
self.kernel_bootstrap_mode = "repo" self.kernel_bootstrap_mode = "repo"
self.external_source_manifest = [] self.external_source_manifest = []
return return
if self.external_sources: if self.external_sources:
# Raw external container mode keeps early distfiles inside init image.
self.external_dir = os.path.join(self.target_dir, 'external')
self.kernel_bootstrap_mode = "raw_external" self.kernel_bootstrap_mode = "raw_external"
self._prepare_kernel_bootstrap_external_manifests() self._prepare_kernel_bootstrap_external_manifests()
return return
# Network-only mode keeps pre-network distfiles inside init image.
self.external_dir = os.path.join(self.target_dir, 'external')
self.kernel_bootstrap_mode = "network_only" self.kernel_bootstrap_mode = "network_only"
self.bootstrap_source_manifest = self.early_source_manifest self.bootstrap_source_manifest = self.early_source_manifest
self.external_source_manifest = [] self.external_source_manifest = []
@ -270,7 +276,7 @@ class Generator():
"""Copy in distfiles""" """Copy in distfiles"""
distfile_dir = os.path.join(self.external_dir, 'distfiles') distfile_dir = os.path.join(self.external_dir, 'distfiles')
if self.kernel_bootstrap_mode in ("raw_external", "repo"): if self.kernel_bootstrap_mode == "raw_external":
self._copy_manifest_distfiles(distfile_dir, self.bootstrap_source_manifest) self._copy_manifest_distfiles(distfile_dir, self.bootstrap_source_manifest)
return return
@ -278,6 +284,14 @@ class Generator():
self._copy_manifest_distfiles(distfile_dir, self.early_source_manifest) self._copy_manifest_distfiles(distfile_dir, self.early_source_manifest)
return return
if self.kernel_bootstrap_mode == "repo":
# Repo mode needs early distfiles in init image and staged external disk.
init_distfile_dir = os.path.join(self.target_dir, 'external', 'distfiles')
self._copy_manifest_distfiles(init_distfile_dir, self.bootstrap_source_manifest)
if init_distfile_dir != distfile_dir:
self._copy_manifest_distfiles(distfile_dir, self.bootstrap_source_manifest)
return
if self.external_sources: if self.external_sources:
shutil.copytree(self.distfiles_dir, distfile_dir, dirs_exist_ok=True) shutil.copytree(self.distfiles_dir, distfile_dir, dirs_exist_ok=True)
else: else: