--- /usr/sbin/vzmigrate.old	2008-10-30 16:26:02.000000000 +0300
+++ /usr/sbin/vzmigrate.new	2008-11-25 11:41:26.000000000 +0300
@@ -579,11 +579,13 @@ else
 			exit $MIG_ERR_MOUNT_VPS
 		fi
 	else
-		log 1 "Turning quota off"
-		if ! logexec 2 $SSH root@$host vzquota off $VEID ; then
-			log 0 "failed to turn quota off"
-			undo_copy_quota
-			exit $MIG_ERR_QUOTA
+		if [ "${DISK_QUOTA}" != "no" ]; then
+			log 1 "Turning quota off"
+			if ! logexec 2 $SSH root@$host vzquota off $VEID ; then
+				log 0 "failed to turn quota off"
+				undo_copy_quota
+				exit $MIG_ERR_QUOTA
+			fi
 		fi
 	fi