From owner-svn-src-head@FreeBSD.ORG  Sun Apr 28 23:43:21 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 79BD9DE9;
 Sun, 28 Apr 2013 23:43:21 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: from mail-pb0-x229.google.com (mail-pb0-x229.google.com
 [IPv6:2607:f8b0:400e:c01::229])
 by mx1.freebsd.org (Postfix) with ESMTP id 45D881BC6;
 Sun, 28 Apr 2013 23:43:21 +0000 (UTC)
Received: by mail-pb0-f41.google.com with SMTP id md4so104272pbc.28
 for <multiple recipients>; Sun, 28 Apr 2013 16:43:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:references:mime-version:in-reply-to:content-type
 :content-transfer-encoding:message-id:cc:x-mailer:from:subject:date
 :to; bh=RYPPlk7NZ1snAEfN89jvlHnrE6Wa7tN+8flTc7Afr5o=;
 b=ZjmCE1+gJdJv9YhxjV/9K59zl9WlkgfrWD873SrtRTM8rnImlW4R0MgK8EeIuC9Bz8
 h17LcXcCXi0uxgGurmOMtrSj+u5WxtVnSr2qAht7E1l/dv/VKeQBhHmBVgycfDNpCvwA
 gD3oK1oky3SX9WcDYc3Qj7S+9axRuLk7wwL47D2eE5MyOupa05LlTICUND13ov7iby0d
 I9FG3pkQpJ8uCealtsY+phlcCXFcFODtdv8F+/Q9B35Fowd3KgT5VO4rTbMvVftTz6vi
 9vPuZOPpqWVrTL3UCliZ5pAf6jNY/zb5fnW+jFjFV7grVkK9ThzfHhU1oshPpZyApLVx
 M43w==
X-Received: by 10.66.148.132 with SMTP id ts4mr41010724pab.19.1367192601104;
 Sun, 28 Apr 2013 16:43:21 -0700 (PDT)
Received: from [10.164.125.87] (mobile-166-147-082-058.mycingular.net.
 [166.147.82.58])
 by mx.google.com with ESMTPSA id tx9sm21427411pbc.27.2013.04.28.16.43.16
 for <multiple recipients>
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Sun, 28 Apr 2013 16:43:20 -0700 (PDT)
References: <201304282144.r3SLijb6084464@svn.freebsd.org>
Mime-Version: 1.0 (1.0)
In-Reply-To: <201304282144.r3SLijb6084464@svn.freebsd.org>
Content-Type: text/plain;
	charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Message-Id: <87DD1BC2-9658-4405-ABC5-BE05C3E6C6B4@gmail.com>
X-Mailer: iPhone Mail (10B329)
From: Garrett Cooper <yaneurabeya@gmail.com>
Subject: Re: svn commit: r250034 - head/tools/tools/nanobsd
Date: Sun, 28 Apr 2013 16:43:11 -0700
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>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Apr 2013 23:43:21 -0000

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=