[Libguestfs] [PATCH] v2v: linux: canonicalize module path for arch detection (RHBZ#1690574)
Pino Toscano
ptoscano at redhat.com
Wed Mar 20 16:28:02 UTC 2019
On Wednesday, 20 March 2019 17:12:22 CET Richard W.M. Jones wrote:
> On Wed, Mar 20, 2019 at 05:00:06PM +0100, Pino Toscano wrote:
> > Kernel modules can be also symlinks to files available outside the
> > "canonical" module directory; since `file` by default does not deference
> > symlinks, passing directly symlinks to the architecture detection
> > results in errors, as the "file" API does not recognize "symbolic link"
> > as architecture.
> >
> > To prevent this situation, canonicalize the path of the module picked
> > for architecture detection: this way, "file-architecture" will run on a
> > real file.
> > ---
> > v2v/linux_kernels.ml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml
> > index 3313aabc7..889ec2f2a 100644
> > --- a/v2v/linux_kernels.ml
> > +++ b/v2v/linux_kernels.ml
> > @@ -189,7 +189,7 @@ let detect_kernels (g : G.guestfs) inspect family bootloader =
> > *)
> > let arch =
> > let any_module = modpath ^ List.hd modules in
> > - g#file_architecture any_module in
> > + g#file_architecture (g#realpath any_module) in
>
> I don't mind this, but would it better to fix the actual API?
The "file" API handles any non-regular file, printing its type (see
also daemon/file.ml). So I'm not sure there is room for changes, since
this is actually a wanted behaviour (see also its tests).
--
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20190320/e394d549/attachment.sig>
More information about the Libguestfs
mailing list