From c6499ec08f354382e9770bcfbbdd640d16bac69b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 12 Dec 2007 12:19:01 +0000
Subject: - ensure failing to build mdkinst.sqfs is a fatal error

---
 perl-install/install/NEWS | 1 +
 tools/mdkinst_stage2_tool | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d89aead32..d2b288195 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- ensure failing to build mdkinst.sqfs is a fatal error
 - drakx-in-chroot:
   o just like stage1, handle <root of distrib> ending with current arch() so
   that we can access main32 on x86_64
diff --git a/tools/mdkinst_stage2_tool b/tools/mdkinst_stage2_tool
index 8dc029e4e..22712515a 100755
--- a/tools/mdkinst_stage2_tool
+++ b/tools/mdkinst_stage2_tool
@@ -36,7 +36,7 @@ if [ $ACTION = "--compress" ]; then
     [ -d "$LIVE_DIR" ] || error
     echo "Creating $COMPRESSED_IMAGE from $LIVE_DIR"
     rm -f $STAGE2_DIR/.room
-    mksquashfs $LIVE_DIR $COMPRESSED_IMAGE -all-root -noappend >/dev/null
+    mksquashfs $LIVE_DIR $COMPRESSED_IMAGE -all-root -noappend >/dev/null || { echo "mksquashfs failed"; exit 1; }
     chmod 755 $COMPRESSED_IMAGE
     echo foo > $STAGE2_DIR/.room
     if [ -s $STAGE2_DIR/.room ]; then
-- 
cgit v1.2.1