diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-09-21 14:20:08 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-09-21 14:20:08 +0000 |
| commit | 50c6f6e1dbfd83f91c085056d6f007d4755ff83a (patch) | |
| tree | e2d43dbc8770236fee5a0456d12db881d616eaa6 | |
| parent | 5f1e94688c06483fd133ae35a9fbbdacdf9094c7 (diff) | |
| download | drakx-50c6f6e1dbfd83f91c085056d6f007d4755ff83a.tar drakx-50c6f6e1dbfd83f91c085056d6f007d4755ff83a.tar.gz drakx-50c6f6e1dbfd83f91c085056d6f007d4755ff83a.tar.bz2 drakx-50c6f6e1dbfd83f91c085056d6f007d4755ff83a.tar.xz drakx-50c6f6e1dbfd83f91c085056d6f007d4755ff83a.zip | |
work both with squashfs 3 and 4
| -rw-r--r-- | rescue/NEWS | 2 | ||||
| -rwxr-xr-x | rescue/make_rescue_img | 2 |
2 files changed, 3 insertions, 1 deletions
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"; |