From owner-svn-src-all@FreeBSD.ORG Sun Nov 18 20:39:20 2012 Return-Path: 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 5C518B15; Sun, 18 Nov 2012 20:39:20 +0000 (UTC) (envelope-from edschouten@gmail.com) Received: from mail-oa0-f54.google.com (mail-oa0-f54.google.com [209.85.219.54]) by mx1.freebsd.org (Postfix) with ESMTP id E015E8FC1B; Sun, 18 Nov 2012 20:39:19 +0000 (UTC) Received: by mail-oa0-f54.google.com with SMTP id n9so5432254oag.13 for ; Sun, 18 Nov 2012 12:39:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=kuQbYOa3XGjhrDlpIonJLBgRrBId8bx13z+PWauwF7k=; b=jN9s4xhw5cw+Mj4hqzAA+cYXyQe4IHpq7T12i8uo9OeDF64ika5kcW93UaDbMoipGh zvyxTbMU8NKTqzDnjDxCoPsuQivEc6i5tI9dNrI7DZqYtGCuKkCfteTPbuvz1ieGGES2 WlTps+uLNYWt4LqBkKxy9x5wVgUFM/YP0Wrht1H27mS/6bSPvSg3cNsveH7aHIYr7Pno 29j0kPXNpg29v0WHB01hOqVaOOvOTqXnCFyaRkxvTU5zO6sueAg7Rh51/kHgDxPlnn1W Xa6LNL2T9aLMf1I3lK2hNewb1rATeK2fHpDZ3+6SMLc8NoZdtkQDutVFelQHAgbtv1Es 832Q== MIME-Version: 1.0 Received: by 10.60.13.73 with SMTP id f9mr1522776oec.131.1353271159304; Sun, 18 Nov 2012 12:39:19 -0800 (PST) Sender: edschouten@gmail.com Received: by 10.76.151.39 with HTTP; Sun, 18 Nov 2012 12:39:19 -0800 (PST) In-Reply-To: <201211181421.qAIEL5KT042019@svn.freebsd.org> References: <201211181421.qAIEL5KT042019@svn.freebsd.org> Date: Sun, 18 Nov 2012 21:39:19 +0100 X-Google-Sender-Auth: hXHJeBFB0dzf9FxHQzBO0A0npkQ Message-ID: Subject: Re: svn commit: r243228 - head/etc From: Ed Schouten To: Chris Rees Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2012 20:39:20 -0000 Hi Chris, 2012/11/18 Chris Rees : > Modified: head/etc/rc.initdiskless > ============================================================================== > --- head/etc/rc.initdiskless Sun Nov 18 14:05:28 2012 (r243227) > +++ head/etc/rc.initdiskless Sun Nov 18 14:21:05 2012 (r243228) > @@ -354,7 +354,7 @@ for i in ${templates} ; do > subdir=${j##*/} > if [ -d $j -a ! -f $j.cpio.gz ]; then > create_md $subdir > - cp -Rp $j/ /$subdir > + (cd $j && pax -rw . /$subdir) > fi > done > for j in /conf/$i/*.cpio.gz ; do Are you sure that this bug wasn't already fixed? The original version of the code in the bug report used the following line: - cp -Rp $j/* /$subdir The old version of the code you changed didn't have this asterisk, meaning dotfiles would already be copied. Still, you could argue that your version is nicer, as our behaviour of cp with the trailing slash contradicts POSIX. Thanks, -- Ed Schouten