diff options
author | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-28 15:43:14 +0100 |
---|---|---|
committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-28 15:45:16 +0100 |
commit | a82bfb88e553c6626c99757779f9b500664409ba (patch) | |
tree | ec065b6e15796164db5840dee006eb5082c89ee0 | |
parent | 549bba81e739ab10d8013c9ca88ce70b0ddda8e4 (diff) | |
download | libguestfs-a82bfb88e553c6626c99757779f9b500664409ba.tar.gz libguestfs-a82bfb88e553c6626c99757779f9b500664409ba.tar.xz libguestfs-a82bfb88e553c6626c99757779f9b500664409ba.zip |
Lib.pm: Use 'file' as replacement for 'zfile'.
-rw-r--r-- | perl/lib/Sys/Guestfs/Lib.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index 00a9bdb8..4020c244 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -1307,10 +1307,10 @@ sub _check_for_initrd my $version = $1; my @modules; - # Disregard old-style compressed ext2 files, since cpio - # takes ages to (fail to) process these. - if ($g->file ("/boot/$initrd") !~ /gzip compressed/ || - $g->zfile ("gzip", "/boot/$initrd") !~ /ext2 filesystem/) { + # Disregard old-style compressed ext2 files and only + # work with real compressed cpio files, since cpio + # takes ages to (fail to) process anything else. + if ($g->file ("/boot/$initrd") =~ /cpio/) { eval { @modules = $g->initrd_list ("/boot/$initrd"); }; |