summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-12 12:19:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-12 12:19:01 +0000
commitc6499ec08f354382e9770bcfbbdd640d16bac69b (patch)
tree25a882be61fb7475fb66ba3af53b1daf88ce5238
parent4afb7d9bf4e57f95eb547a61cb1f000d0de8bcc3 (diff)
downloaddrakx-c6499ec08f354382e9770bcfbbdd640d16bac69b.tar
drakx-c6499ec08f354382e9770bcfbbdd640d16bac69b.tar.gz
drakx-c6499ec08f354382e9770bcfbbdd640d16bac69b.tar.bz2
drakx-c6499ec08f354382e9770bcfbbdd640d16bac69b.tar.xz
drakx-c6499ec08f354382e9770bcfbbdd640d16bac69b.zip
- ensure failing to build mdkinst.sqfs is a fatal error
-rw-r--r--perl-install/install/NEWS1
-rwxr-xr-xtools/mdkinst_stage2_tool2
2 files changed, 2 insertions, 1 deletions
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