This is the isolinux/ directory: {{{ [root@sara0202 isolinux]# ls -l total 25165 -r--r--r-- 1 root root 2048 2007-06-29 12:38 boot.cat -r--r--r-- 1 root root 4483253 2007-06-29 12:30 initrd-2.6.21-1.3228.fc7debug.img -r--r--r-- 1 root root 4470356 2007-06-29 12:30 initrd-2.6.21-1.3228.fc7.img -r--r--r-- 1 root root 4485046 2007-06-29 12:30 initrd-2.6.21-1.3228.fc7PAE-debug.img -r--r--r-- 1 root root 4469014 2007-06-29 12:30 initrd-2.6.21-1.3228.fc7PAE.img -r--r--r-- 1 root root 10932 2007-06-29 12:30 isolinux.bin -r--r--r-- 1 root root 1722 2007-06-29 12:30 isolinux.cfg -r--r--r-- 1 root root 32270 2007-06-29 12:30 splash.jpg -r--r--r-- 1 root root 117152 2007-06-29 12:30 vesamenu.c32 -r--r--r-- 1 root root 1884020 2007-06-29 12:30 vmlinuz-2.6.21-1.3228.fc7 -r--r--r-- 1 root root 1957492 2007-06-29 12:30 vmlinuz-2.6.21-1.3228.fc7debug -r--r--r-- 1 root root 1890164 2007-06-29 12:30 vmlinuz-2.6.21-1.3228.fc7PAE -r--r--r-- 1 root root 1962164 2007-06-29 12:30 vmlinuz-2.6.21-1.3228.fc7PAE-debug }}}
Screenshot of LiveCD in QEMU
isolinux.cfg isolinux.cfg
debug logfile for this run revisor-livecd-multiplekernels.log
{{{ [root@sara0202 ~]# mount -r -t iso9660 -o loop,norock,nojoliet /srv/revisor/live/livecd-20070629.iso /mnt/k8/ [root@sara0202 ~]# cd /mnt/k8/ [root@sara0202 k8]# ls isolinux squashfs.img sysroot [root@sara0202 k8]# cd isolinux/ [root@sara0202 isolinux]# ls -l total 25165 -r-xr-xr-x 1 root root 2048 2007-06-29 12:38 boot.cat -r-xr-xr-x 1 root root 4469014 2007-06-29 12:30 initr000.img -r-xr-xr-x 1 root root 4470356 2007-06-29 12:30 initr001.img -r-xr-xr-x 1 root root 4483253 2007-06-29 12:30 initr002.img -r-xr-xr-x 1 root root 4485046 2007-06-29 12:30 initrd_2.img -r-xr-xr-x 1 root root 10932 2007-06-29 12:30 isolinux.bin -r-xr-xr-x 1 root root 1722 2007-06-29 12:30 isolinux.cfg -r-xr-xr-x 1 root root 32270 2007-06-29 12:30 splash.jpg -r-xr-xr-x 1 root root 117152 2007-06-29 12:30 vesamenu.c32 -r-xr-xr-x 1 root root 1884020 2007-06-29 12:30 vmlin000.fc7 -r-xr-xr-x 1 root root 1890164 2007-06-29 12:30 vmlin001.fc7 -r-xr-xr-x 1 root root 1962164 2007-06-29 12:30 vmlin002.fc7 -r-xr-xr-x 1 root root 1957492 2007-06-29 12:30 vmlinuz_.fc7 [root@sara0202 isolinux]# }}}
DOH!
Doing a test run with:
{{{ kernel_types = { "PAEdebug": { "regexp": ".*PAEdebug", "initrd": "initpaed.img", "vmlinuz": "vmlpaed" },
"PAE": { "regexp": ".*PAE", "initrd": "initpae.img", "vmlinuz": "vmlpae" }, "xen": { "regexp": ".*xen$", "initrd": "initxen.img", "vmlinuz": "vmlxen" }, "debug": { "regexp": ".*debug$", "initrd": "initdbg.img", "vmlinuz": "vmldebug" }, "normal": { "regexp": "^.*$", "initrd": "initrd.img", "vmlinuz": "vmlinuz" } } kernel_dirs = [] kernels = [] modules_dir = "%s/install_root/lib/modules" % self.build_dir if os.path.isdir(modules_dir): kernel_dirs = os.listdir(modules_dir) if not kernel_dirs: raise InstallationError(_("No kernels installed: /lib/modules is empty")) for kernel_dir in kernel_dirs: found = False for kernel_type in kernel_types.keys(): if not found: if re.match(kernel_types[kernel_type][regexp], kernel_dir): kernels.append({"name": kernel_dir, "initrd": kernel_types[kernel_type]["initrd"], "vmlinuz": kernel_types[kernel_type]["vmlinuz"], "type": kernel_type }) found = True self.log.debug("Kernels: %s" % str(kernels)) return kernels
}}}
Example output: {{{ [{'vmlinuz': 'vmlinuz', 'initrd': 'initrd.img', 'type': 'normal', 'name': '2.6.21-1.3228.fc7'}, {'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7debug'}, {'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7PAE-debug'}, {'vmlinuz': 'vmlinuz', 'initrd': 'initrd.img', 'type': 'normal', 'name': '2.6.21-1.3228.fc7PAE'}] Kernels: [{'vmlinuz': 'vmlinuz', 'initrd': 'initrd.img', 'type': 'normal', 'name': '2.6.21-1.3228.fc7'}, {'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7debug'}, {'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7PAE-debug'}, {'vmlinuz': 'vmlinuz', 'initrd': 'initrd.img', 'type': 'normal', 'name': '2.6.21-1.3228.fc7PAE'}] DEBUG:revisor:Kernels: [{'vmlinuz': 'vmlinuz', 'initrd': 'initrd.img', 'type': 'normal', 'name': '2.6.21-1.3228.fc7'}, {'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7debug'}, {'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7PAE-debug'}, {'vmlinuz': 'vmlinuz', 'initrd': 'initrd.img', 'type': 'normal', 'name': '2.6.21-1.3228.fc7PAE'}] }}}
hmm, kernel-PAE-debug is recognized as: {{{ { 'vmlinuz': 'vmldebug', 'initrd': 'initdbg.img', 'type': 'debug', 'name': '2.6.21-1.3228.fc7PAE-debug' } }}}
Thus matching ".debug$", but not ".PAE-debug$"... :(
Fixed
Metadata Update from @kanarip: - Issue assigned to kanarip - Issue set to the milestone: 2.0.4 Release