From 50c6f6e1dbfd83f91c085056d6f007d4755ff83a Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Mon, 21 Sep 2009 14:20:08 +0000
Subject: work both with squashfs 3 and 4

---
 rescue/NEWS            | 2 ++
 rescue/make_rescue_img | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rescue/NEWS b/rescue/NEWS
index 0ddb7c8c6..53b1c499c 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- work both with squashfs 3 and 4
+
 Version 1.15 - 3 September 2009, by Thierry Vignaud
 
 - add back dumpe2fs
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 3cbf97aab..2d226afdc 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -56,6 +56,6 @@ if (my ($LANGUAGE) = map { if_(/LANGUAGE_(.*)/, $1) } keys %ENV) {
 
 exit 0 if $ARGV[0];
 
-_ "mksquashfs3 $tmp $rescue -all-root -noappend >/dev/null";
+_ "mksquashfs $tmp $rescue -all-root -noappend >/dev/null || mksquashfs3 $tmp $rescue -all-root -noappend >/dev/null";
 _ "chmod 755 $rescue";
 _ "rm -rf $tmp";
-- 
cgit v1.2.1