live-bootstrap

commit: 8884d7980292ae4a31adcadf4d3ca7e5a3def69e
parent b02c35443f7339303a14fe411993c8277719ad96
Author: Googulator <netrolller.3d@gmail.com>
Date:   Wed, 22 May 2024 00:51:07 +0200

Allow use of base.tar.bz2 from previous build as early preseed

base.tar.bz2 will contain the "steps" and "external" subdirectories, which we later try to create - ensure that they are deleted when restoring an early preseed; this way base.tar.bz2 works without any modification as a preseed tarball
Diffstat:
M
lib/generator.py
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/generator.py b/lib/generator.py
@@ -70,18 +70,22 @@ class Generator():
             self.target_dir = os.path.join(self.target_dir, 'disk')
             self.external_dir = os.path.join(self.target_dir, 'external')
 
-        os.makedirs(self.external_dir)
-
         if self.early_preseed:
             # Extract tar containing preseed
             with tarfile.open(self.early_preseed, "r") as seed:
                 seed.extractall(self.target_dir)
+            if os.path.exists(os.path.join(self.target_dir, 'steps')):
+                shutil.rmtree(os.path.join(self.target_dir, 'steps'))
+            if os.path.exists(self.external_dir):
+                shutil.rmtree(self.external_dir)
             shutil.copy2(os.path.join(self.git_dir, 'seed', 'preseeded.kaem'),
                          os.path.join(self.target_dir, 'kaem.x86'))
         else:
             self.stage0_posix(kernel_bootstrap)
             self.seed()
 
+        os.makedirs(self.external_dir)
+
         self.steps()
 
         self.distfiles()