svn commit: r221850 - head/tools/tools/nanobsd

[Henrik Brix Andersen]

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 at FreeBSD.org>



-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 194 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/svn-src-head/attachments/20110515/82588b9e/PGP.pgp