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

lorax: Only run depmod on the installed kernels

Browse Source 
In the near-future there may be /lib/modules/ directories for older
kernels with weak dependencies listed. These may not match the installed
kernel(s) so we cannot depend on them to drive generate_module_data.

Instead use the existing findkernels() function to get the list of
installed kernels and iterate those, running depmod on them.

Resolves: rhbz#1632140

(cherry picked from commit 07acd2e780)
This commit is contained in:
Brian C. Lane 2018-08-28 16:56:50 -07:00
parent 9cb0df6223
commit c355f0f203
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pylorax/treebuilder.py
View File

@ -209,11 +209,11 @@ class RuntimeBuilder(object):
def generate_module_data(self): def generate_module_data(self):
root = self.vars.root root = self.vars.root
moddir = joinpaths(root, "lib/modules/") moddir = joinpaths(root, "lib/modules/")
for kver in os.listdir(moddir): for kernel in findkernels(root=root):
ksyms = joinpaths(root, "boot/System.map-%s" % kver) ksyms = joinpaths(root, "boot/System.map-%s" % kernel.version)
logger.info("doing depmod and module-info for %s", kver) logger.info("doing depmod and module-info for %s", kernel.version)
runcmd(["depmod", "-a", "-F", ksyms, "-b", root, kver]) runcmd(["depmod", "-a", "-F", ksyms, "-b", root, kernel.version])
generate_module_info(moddir+kver, outfile=moddir+"module-info") generate_module_info(moddir+kernel.version, outfile=moddir+"module-info")
def create_runtime(self, outfile="/var/tmp/squashfs.img", compression="xz", compressargs=None, size=2): def create_runtime(self, outfile="/var/tmp/squashfs.img", compression="xz", compressargs=None, size=2):
# make live rootfs image - must be named "LiveOS/rootfs.img" for dracut # make live rootfs image - must be named "LiveOS/rootfs.img" for dracut