Correctly respect --dry-run option for fsadm

Fix missing 'dry' execution of lvresize - fixing problem where resize
command were 'dry-run' executed - but lvresize has been executed for real.

Also adapt code slightly to support better recursive execution of fsadm
through lvresize call.

diff --git a/WHATS_NEW b/WHATS_NEW
index 4547a0a1bf03dc00f3556a3c24e72b4b6ecd3239..85eaa7a9fc0d0d1377cfe09845cd4eaadebfd093 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.75 - 
 =====================================
+  Do not execute lvresize with --dry-run option for fsadm.
   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.

diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 50720b1d05f4c4f3ff605458d7a30bb1834944b0..476f15058d8a8487f78fc62ba79a11ad2d5f275a 100644 (file)
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -125,10 +125,13 @@ cleanup() {
        IFS=$IFS_OLD
        trap 2
 
-       # start LVRESIZE with the filesystem modification flag
-       # and allow recursive call of fsadm
-       unset FSADM_RUNNING
-       test "$DO_LVRESIZE" -eq 2 && exec $LVM lvresize $VERB -r -L$(( $NEWSIZE / 1048576 )) $VOLUME
+       if [ "$DO_LVRESIZE" -eq 2 ]; then
+               # start LVRESIZE with the filesystem modification flag
+               # and allow recursive call of fsadm
+               unset FSADM_RUNNING
+               dry exec $LVM lvresize $VERB $FORCE -r -L${NEWSIZE}b $VOLUME_ORIG
+       fi
+        
        # error exit status for break
        exit ${1:-1}
 }