From patchwork Sat Mar 16 09:13:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Racek X-Patchwork-Id: 228203 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0291F2C0085 for ; Sat, 16 Mar 2013 20:13:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333Ab3CPJNj (ORCPT ); Sat, 16 Mar 2013 05:13:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57283 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753029Ab3CPJNi (ORCPT ); Sat, 16 Mar 2013 05:13:38 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2G9Dcgh017270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 16 Mar 2013 05:13:38 -0400 Received: from luke.redhat.com (vpn1-4-104.ams2.redhat.com [10.36.4.104]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2G9DXv1027968; Sat, 16 Mar 2013 05:13:37 -0400 From: Tomas Racek To: linux-ext4@vger.kernel.org Cc: Tomas Racek Subject: [PATCH 3/3] e2image: require that -a option is used only with raw or QCOW2 image Date: Sat, 16 Mar 2013 10:13:25 +0100 Message-Id: <1363425205-10970-3-git-send-email-tracek@redhat.com> In-Reply-To: <1363425205-10970-1-git-send-email-tracek@redhat.com> References: <1363425205-10970-1-git-send-email-tracek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org All data cannot be included in normal image file so e2image should exit in this case. Signed-off-by: Tomas Racek Reviewed-by: Eric Sandeen --- misc/e2image.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/misc/e2image.c b/misc/e2image.c index 6988c4d..b4e4cf9 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -1295,6 +1295,13 @@ int main (int argc, char ** argv) } if (optind != argc - 2 ) usage(); + + if(all_data && !img_type) { + com_err(program_name, 0, "-a option can only be used " + "with raw or QCOW2 images."); + exit(1); + } + device_name = argv[optind]; image_fn = argv[optind+1];