almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

refactor: split make_initramfs_runtime out of compress()

Browse Source 
No code changes here.
This commit is contained in:
Will Woods 2011-06-09 13:03:04 -04:00
parent 6b8fa8447a
commit fc000a51e1
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pylorax/installtree.py
View File

@ -505,7 +505,6 @@ class LoraxInstallTree(BaseLoraxClass):
shutil.copy2(src, dst) shutil.copy2(src, dst)
def compress(self, initrd, kernel, type="xz", args="-9"): def compress(self, initrd, kernel, type="xz", args="-9"):
chdir = lambda: os.chdir(self.root)
start = time.time() start = time.time()
# move corresponding modules to the tree # move corresponding modules to the tree
@ -513,6 +512,19 @@ class LoraxInstallTree(BaseLoraxClass):
shutil.move(joinpaths(self.workdir, kernel.version), shutil.move(joinpaths(self.workdir, kernel.version),
joinpaths(self.root, "modules")) joinpaths(self.root, "modules"))
self.make_initramfs_runtime(initrd, kernel, type, args)
# move modules out of the tree again
logger.debug("moving modules outside initrd")
shutil.move(joinpaths(self.root, "modules", kernel.version),
self.workdir)
elapsed = time.time() - start
return True, elapsed
def make_initramfs_runtime(self, initrd, kernel, type, args):
chdir = lambda: os.chdir(self.root)
find = subprocess.Popen([self.lcmds.FIND, "."], stdout=subprocess.PIPE, find = subprocess.Popen([self.lcmds.FIND, "."], stdout=subprocess.PIPE,
preexec_fn=chdir) preexec_fn=chdir)
@ -531,14 +543,6 @@ class LoraxInstallTree(BaseLoraxClass):
logger.debug("compressing") logger.debug("compressing")
rc = compressed.wait() rc = compressed.wait()
# move modules out of the tree again
logger.debug("moving modules outside initrd")
shutil.move(joinpaths(self.root, "modules", kernel.version),
self.workdir)
elapsed = time.time() - start
return True, elapsed
@property @property
def kernels(self): def kernels(self):