From owner-svn-src-stable-7@FreeBSD.ORG  Sun Oct 30 12:23:07 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84E281065772;
	Sun, 30 Oct 2011 12:23:07 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E44548FC13;
	Sun, 30 Oct 2011 12:23:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9UCN69P068086;
	Sun, 30 Oct 2011 12:23:06 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9UCN68m068084;
	Sun, 30 Oct 2011 12:23:06 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201110301223.p9UCN68m068084@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 30 Oct 2011 12:23:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226936 - stable/7/sys/geom/part
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Oct 2011 12:23:07 -0000

Author: marius
Date: Sun Oct 30 12:23:06 2011
New Revision: 226936
URL: http://svn.freebsd.org/changeset/base/226936

Log:
  MFC: r226522
  
  Allow to dump on Solaris swap partitions.
  
  PR:		161764
  Submitted by:	Peter Jeremy

Modified:
  stable/7/sys/geom/part/g_part_vtoc8.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/part/g_part_vtoc8.c
==============================================================================
--- stable/7/sys/geom/part/g_part_vtoc8.c	Sun Oct 30 12:23:04 2011	(r226935)
+++ stable/7/sys/geom/part/g_part_vtoc8.c	Sun Oct 30 12:23:06 2011	(r226936)
@@ -272,7 +272,8 @@ g_part_vtoc8_dumpto(struct g_part_table 
 	 */
 	table = (struct g_part_vtoc8_table *)basetable;
 	tag = be16dec(&table->vtoc.part[entry->gpe_index - 1].tag);
-	return ((tag == 0 || tag == VTOC_TAG_FREEBSD_SWAP) ? 1 : 0);
+	return ((tag == 0 || tag == VTOC_TAG_FREEBSD_SWAP ||
+	    tag == VTOC_TAG_SWAP) ? 1 : 0);
 }
 
 static int