Date: Sun, 28 Apr 2013 16:43:11 -0700 From: Garrett Cooper <yaneurabeya@gmail.com> To: Nick Hibma <n_hibma@FreeBSD.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r250034 - head/tools/tools/nanobsd Message-ID: <87DD1BC2-9658-4405-ABC5-BE05C3E6C6B4@gmail.com> In-Reply-To: <201304282144.r3SLijb6084464@svn.freebsd.org> References: <201304282144.r3SLijb6084464@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Apr 28, 2013, at 2:44 PM, Nick Hibma <n_hibma@FreeBSD.org> wrote: > Author: n_hibma > Date: Sun Apr 28 21:44:44 2013 > New Revision: 250034 > URL: http://svnweb.freebsd.org/changeset/base/250034 >=20 > Log: > Doing a cpio from /var/empty if dir was not specified or non-existent > copies its mode to the destination. This is not desirable. > Rephrase this code to be more sensible. >=20 > PR: 173483 > MFC after: 1 week >=20 > Modified: > head/tools/tools/nanobsd/nanobsd.sh >=20 > Modified: head/tools/tools/nanobsd/nanobsd.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/tools/tools/nanobsd/nanobsd.sh Sun Apr 28 21:14:23 2013 (r2= 50033) > +++ head/tools/tools/nanobsd/nanobsd.sh Sun Apr 28 21:44:44 2013 (r2= 50034) > @@ -413,12 +413,13 @@ populate_slice ( ) ( > dir=3D$2 > mnt=3D$3 > lbl=3D$4 > - test -z $2 && dir=3D${NANO_WORLDDIR}/var/empty > - test -d $dir || dir=3D${NANO_WORLDDIR}/var/empty > - echo "Creating ${dev} with ${dir} (mounting on ${mnt})" > - newfs_part $dev $mnt $lbl > - cd ${dir} > - find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt} > + echo "Creating ${dev} (mounting on ${mnt})" > + newfs_part ${dev} ${mnt} ${lbl} > + if [ -n "${dir}" -a -d "${dir}" ]; then > + echo "Populating ${lbl} from ${dir}" > + cd ${dir} > + find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt} > + fi > df -i ${mnt} > umount ${mnt} > ) Awesome! Would you be interested in ushering in some of the nanobsd PRs in t= he queue, perhaps? Thanks! -Garrett=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87DD1BC2-9658-4405-ABC5-BE05C3E6C6B4>