svn commit: r243228 - head/etc

[Chris Rees]

On 18 Nov 2012 20:39, "Ed Schouten" <ed at 80386.nl> wrote:
>
> Hi Chris,
>
> 2012/11/18 Chris Rees <crees at freebsd.org>:
> > 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.
>

You are correct, and the second to point it out :)

As you say however, pax is technically how it should be done anyway, and
has the nice effect of also preserving hard links.  If no-one objects I
think it should stay in.

This is unfortunately another example of many in rc of where something was
fixed ages ago and no-one checked GNATS :(  Of course, this is still my
fault.

Chris