On Wednesday, November 06, 2013 04:47:37 PM Matthew Booth wrote:
Thanks, Mike. ACK to all of these, and pushed.
Thank you!
As it happens, I'd already started breaking some of this stuff out myself when I found this patchset :/ Rather than redo it, I've kept what I'd already done and rebased on top of it.
Sorry for the duplication of efforts. Now that the existing code is a bit more generic, I expect the SUSE specific changes to be much less painful.
I also did some testing and fixed a couple of bugs:
"/files$grub->{grub_conf}*/kernel/root" should have been "/files $grub->{grub_conf}/*/kernel/root" in _remap_block_devices.
I caught that one in my testing as well. Sorry about that.
It turns out that the release suffix used by RHEL 4 and 5 really is 'xen', not '-xen'. Note that this is the release, not the package name, which is what confused me when I originally reviewed it. I've removed this change.
Ok, I understand what is going on. In _inspect_linux_kernel, the version of Xen PV kernels is determined by the filename, such as vmlinuz-2.6.18-348.2.1.el5xen, which indeed can end in 'xen'. I'll likely have to also remove any '-xen' strings for the SUSE case, but I'll look into this a bit further.
Can you please pull the latest from git and rebase any future patches on top of that? Please be careful not to reintroduce the '-xen' change! I've accidentally done that at least once whilst working on this patchset.
Will do. Thanks again for the work here. -Mike