Fix a serious bug in the behavior of fasdm tool when breaked.

Under certain conditions it was possible to break (^C) fsadm before actually
resizing filesystem, but lvresize which executed fsadm will think resize
was succesful and shrinks partitions with unresized filesystem on it.

Fix by returning error (1) for this case - this stops lvresize from futher
proceding in resize operation.

diff --git a/WHATS_NEW b/WHATS_NEW
index 9198056b9a1d247b5369004ac7ef41e08d3a7c72..4547a0a1bf03dc00f3556a3c24e72b4b6ecd3239 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.75 - 
 =====================================
+  Fix fsadm return error code from user's break action.
   Allow CC to be overridden at build time (for 'scan-build make').
   Rename 'flags' to 'status' in struct metadata_area.
   Avoid segfault by limiting partial mode for lvm1 metadata. (2.02.74)

diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 517b3950d53618d0993376a8b0c7e3e1bacd64d1..50720b1d05f4c4f3ff605458d7a30bb1834944b0 100644 (file)
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -129,7 +129,8 @@ cleanup() {
        # and allow recursive call of fsadm
        unset FSADM_RUNNING
        test "$DO_LVRESIZE" -eq 2 && exec $LVM lvresize $VERB -r -L$(( $NEWSIZE / 1048576 )) $VOLUME
-       exit ${1:-0}
+       # error exit status for break
+       exit ${1:-1}
 }
 
 # convert parameter from Exa/Peta/Tera/Giga/Mega/Kilo/Bytes and blocks