From: Richard Jones <rjones@trick.home.annexia.org>
Date: Tue, 28 Jul 2009 14:43:14 +0000 (+0100)
Subject: Lib.pm: Use 'file' as replacement for 'zfile'.
X-Git-Tag: 1.0.65~14
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=a82bfb88e553c6626c99757779f9b500664409ba;hp=549bba81e739ab10d8013c9ca88ce70b0ddda8e4

Lib.pm: Use 'file' as replacement for 'zfile'.
---

diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
index 00a9bdb..4020c24 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");
 		};