From owner-svn-src-all@FreeBSD.ORG  Wed Nov 21 18:12:28 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A9311995;
 Wed, 21 Nov 2012 18:12:28 +0000 (UTC)
 (envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8EF068FC1B;
 Wed, 21 Nov 2012 18:12:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qALICS59006560;
 Wed, 21 Nov 2012 18:12:28 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qALICSOW006559;
 Wed, 21 Nov 2012 18:12:28 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201211211812.qALICSOW006559@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Wed, 21 Nov 2012 18:12:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243374 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Nov 2012 18:12:28 -0000

Author: crees (ports committer)
Date: Wed Nov 21 18:12:28 2012
New Revision: 243374
URL: http://svnweb.freebsd.org/changeset/base/243374

Log:
  Revert r243228.  This commit appears to cause more trouble than
  it was designed to avoid; the issue described in the PR was no
  longer an issue anyway.

Modified:
  head/etc/rc.initdiskless

Modified: head/etc/rc.initdiskless
==============================================================================
--- head/etc/rc.initdiskless	Wed Nov 21 17:05:57 2012	(r243373)
+++ head/etc/rc.initdiskless	Wed Nov 21 18:12:28 2012	(r243374)
@@ -354,7 +354,7 @@ for i in ${templates} ; do
 	subdir=${j##*/}
 	if [ -d $j -a ! -f $j.cpio.gz  ]; then
 	    create_md $subdir
-	    (cd $j && pax -rw . /$subdir)
+	    cp -Rp $j/ /$subdir
 	fi
     done
     for j in /conf/$i/*.cpio.gz ; do