From owner-svn-src-head@FreeBSD.ORG  Sun Mar 13 18:26:17 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C252106564A;
	Sun, 13 Mar 2011 18:26:17 +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 0A5618FC1A;
	Sun, 13 Mar 2011 18:26:17 +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 p2DIQGbq062475;
	Sun, 13 Mar 2011 18:26:16 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2DIQGks062473;
	Sun, 13 Mar 2011 18:26:16 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201103131826.p2DIQGks062473@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 13 Mar 2011 18:26:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219618 - head/usr.sbin/bsdinstall/distextract
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2011 18:26:17 -0000

Author: nwhitehorn
Date: Sun Mar 13 18:26:16 2011
New Revision: 219618
URL: http://svn.freebsd.org/changeset/base/219618

Log:
  Rewind manifest file in case distributions are in a different order there.

Modified:
  head/usr.sbin/bsdinstall/distextract/distextract.c

Modified: head/usr.sbin/bsdinstall/distextract/distextract.c
==============================================================================
--- head/usr.sbin/bsdinstall/distextract/distextract.c	Sun Mar 13 18:23:47 2011	(r219617)
+++ head/usr.sbin/bsdinstall/distextract/distextract.c	Sun Mar 13 18:26:16 2011	(r219618)
@@ -96,6 +96,8 @@ count_files(const char *file)
 	if (manifest != NULL) {
 		char line[512];
 		char *tok1, *tok2;
+
+		rewind(manifest);
 		while (fgets(line, sizeof(line), manifest) != NULL) {
 			tok2 = line;
 			tok1 = strsep(&tok2, "\t");