From owner-svn-src-head@FreeBSD.ORG Sun May 15 10:37:55 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD2A2106566C; Sun, 15 May 2011 10:37:55 +0000 (UTC) (envelope-from brix@FreeBSD.org) Received: from solow.pil.dk (relay.pil.dk [195.41.47.164]) by mx1.freebsd.org (Postfix) with ESMTP id 1FC3F8FC0C; Sun, 15 May 2011 10:37:54 +0000 (UTC) Received: from druadan.brixandersen.dk (0x55534f5f.adsl.cybercity.dk [85.83.79.95]) by solow.pil.dk (Postfix) with ESMTPA id 066831CC011; Sun, 15 May 2011 12:21:05 +0200 (CEST) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Apple-Mail-10-730147787" From: Henrik Brix Andersen In-Reply-To: <201105131828.p4DISPYa078965@svn.freebsd.org> Date: Sun, 15 May 2011 12:21:02 +0200 Content-Transfer-Encoding: 7bit Message-Id: References: <201105131828.p4DISPYa078965@svn.freebsd.org> To: Warner Losh X-Pgp-Agent: GPGMail 1.3.3 X-Mailer: Apple Mail (2.1084) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r221850 - head/tools/tools/nanobsd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2011 10:37:55 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --Apple-Mail-10-730147787 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii 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 >=20 > Log: > Copy symbolic links as files rather than recreating the links. >=20 > PR: misc/151697 > Submitted by: lev@ > MFC after: 2 weeks >=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 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} > ) >=20 > = ####################################################################### > @@ -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 > ) >=20 > # Count & report how many we have to install --=20 Henrik Brix Andersen --Apple-Mail-10-730147787 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Darwin) iEYEARECAAYFAk3PqQ4ACgkQv+Q4flTiePjaiQCfd4kgUvMNu93cPAU3eIZbsYL4 qW8AoLMPSYqhnVHHF0pXCQkhR42FgatY =RxPx -----END PGP SIGNATURE----- --Apple-Mail-10-730147787--