From 9ed4ae9a598fbd818929b395f0f4b4215dd848d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Stefanik?= Date: Sat, 23 Dec 2023 07:11:31 +0100 Subject: [PATCH] Support reusing existing directory for multipass bootstrapping --- lib/generator.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/generator.py b/lib/generator.py index 82ecd1e..fff9191 100755 --- a/lib/generator.py +++ b/lib/generator.py @@ -32,6 +32,13 @@ class Generator(): self.tmp_dir = None self.external_dir = None + def reuse(self, tmpdir): + """ + Reuse a previously prepared bwrap environment for further stages. + """ + self.tmp_dir = tmpdir.path + self.external_dir = os.path.join(self.tmp_dir, 'external') + def prepare(self, tmpdir, using_kernel=False, kernel_bootstrap=False, target_size=0): """ Prepare basic media of live-bootstrap. @@ -39,8 +46,7 @@ class Generator(): / -- contains seed to allow steps to be built, containing custom scripts and stage0-posix """ - self.tmp_dir = tmpdir.path - self.external_dir = os.path.join(self.tmp_dir, 'external') + self.reuse(tmpdir) # We use ext3 here; ext4 actually has a variety of extensions that # have been added with varying levels of recency