From owner-svn-src-user@FreeBSD.ORG  Thu Jan  6 03:56:01 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF763106564A;
	Thu,  6 Jan 2011 03:56:01 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E0E9B8FC08;
	Thu,  6 Jan 2011 03:56:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p063u1QN001115;
	Thu, 6 Jan 2011 03:56:01 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p063u1hN001113;
	Thu, 6 Jan 2011 03:56:01 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101060356.p063u1hN001113@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 6 Jan 2011 03:56:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217041 - user/nwhitehorn/bsdinstall/partedit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2011 03:56:02 -0000

Author: nwhitehorn
Date: Thu Jan  6 03:56:01 2011
New Revision: 217041
URL: http://svn.freebsd.org/changeset/base/217041

Log:
  Use the newly-available "modified" attribute in gpart to determine if we
  have to do anything. This avoids an unnecessary warning due to an EPERM
  trying to commit/undo changes on an unmodified geom.

Modified:
  user/nwhitehorn/bsdinstall/partedit/partedit.c

Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/partedit.c	Thu Jan  6 03:36:04 2011	(r217040)
+++ user/nwhitehorn/bsdinstall/partedit/partedit.c	Thu Jan  6 03:56:01 2011	(r217041)
@@ -99,6 +99,7 @@ main(void) {
 				error = apply_changes(&mesh);
 				break;
 			} else if (op == 3) { /* Don't save => Quit */
+				gpart_revert_all(&mesh);
 				error =	-1;
 				break;
 			}