Date: Sun, 15 May 2011 12:21:02 +0200 From: Henrik Brix Andersen <brix@FreeBSD.org> To: Warner Losh <imp@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r221850 - head/tools/tools/nanobsd Message-ID: <ED9B2711-64E4-430F-8FDD-3D2BFEC9880C@FreeBSD.org> In-Reply-To: <201105131828.p4DISPYa078965@svn.freebsd.org> References: <201105131828.p4DISPYa078965@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On May 13, 2011, at 20:28, Warner Losh wrote: > Author: imp > Date: Fri May 13 18:28:25 2011 > New Revision: 221850 > URL: http://svn.freebsd.org/changeset/base/221850 > > Log: > Copy symbolic links as files rather than recreating the links. > > PR: misc/151697 > Submitted by: lev@ > MFC after: 2 weeks > > Modified: > head/tools/tools/nanobsd/nanobsd.sh > > Modified: head/tools/tools/nanobsd/nanobsd.sh > ============================================================================== > --- head/tools/tools/nanobsd/nanobsd.sh Fri May 13 18:20:24 2011 (r221849) > +++ head/tools/tools/nanobsd/nanobsd.sh Fri May 13 18:28:25 2011 (r221850) > @@ -418,7 +418,7 @@ populate_slice ( ) ( > echo "Creating ${dev} with ${dir} (mounting on ${mnt})" > newfs_part $dev $mnt $lbl > cd ${dir} > - find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt} > + find . -print | grep -Ev '/(CVS|\.svn)' | cpio -Ldumpv ${mnt} > df -i ${mnt} > umount ${mnt} > ) > @@ -674,7 +674,7 @@ cust_allow_ssh_root () ( The above change breaks nanobsd.sh for me. CPIO will now try to follow all symbolic links in _.w/ - e.g. _.w/sys, which points to a non-existing _.w/usr/src/sys - and fail with "cpio: Can't stat ./sys". > cust_install_files () ( > cd ${NANO_TOOLS}/Files > - find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${NANO_WORLDDIR} > + find . -print | grep -Ev '/(CVS|\.svn)' | cpio -Ldumpv ${NANO_WORLDDIR} > ) > > ####################################################################### > @@ -687,7 +687,7 @@ cust_pkg () ( > ( > cd ${NANO_PACKAGE_DIR} > find ${NANO_PACKAGE_LIST} -print | > - cpio -dumpv ${NANO_WORLDDIR}/Pkg > + cpio -Ldumpv ${NANO_WORLDDIR}/Pkg > ) > > # Count & report how many we have to install -- Henrik Brix Andersen <brix@FreeBSD.org> [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Darwin) iEYEARECAAYFAk3PqQ4ACgkQv+Q4flTiePjaiQCfd4kgUvMNu93cPAU3eIZbsYL4 qW8AoLMPSYqhnVHHF0pXCQkhR42FgatY =RxPx -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ED9B2711-64E4-430F-8FDD-3D2BFEC9880C>