From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Fri, 8 Oct 2010 13:47:10 +0000 (+0000)
Subject: Correctly respect --dry-run option for fsadm
X-Git-Tag: v2_02_91~1504
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fd86754329f7e9d57905e75140fab30f6a845156;p=lvm2.git

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 4547a0a1b..85eaa7a9f 100644
--- 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 50720b1d0..476f15058 100644
--- 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}
 }