From owner-freebsd-bugs@FreeBSD.ORG  Thu Nov  8 20:30:01 2012
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 87D1D19E
 for <freebsd-bugs@hub.freebsd.org>; Thu,  8 Nov 2012 20:30:01 +0000 (UTC)
 (envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 45C0E8FC16
 for <freebsd-bugs@hub.freebsd.org>; Thu,  8 Nov 2012 20:30:01 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8KU1Hd067220
 for <freebsd-bugs@freefall.freebsd.org>; Thu, 8 Nov 2012 20:30:01 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA8KU1Ga067214;
 Thu, 8 Nov 2012 20:30:01 GMT (envelope-from gnats)
Resent-Date: Thu, 8 Nov 2012 20:30:01 GMT
Resent-Message-Id: <201211082030.qA8KU1Ga067214@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nick Hibma <nick@anywi.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 56A6D176
 for <freebsd-gnats-submit@FreeBSD.org>; Thu,  8 Nov 2012 20:27:59 +0000 (UTC)
 (envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
 by mx1.freebsd.org (Postfix) with ESMTP id 3FAD48FC12
 for <freebsd-gnats-submit@FreeBSD.org>; Thu,  8 Nov 2012 20:27:59 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
 by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8KRwDZ063261
 for <freebsd-gnats-submit@FreeBSD.org>; Thu, 8 Nov 2012 20:27:58 GMT
 (envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
 by red.freebsd.org (8.14.5/8.14.5/Submit) id qA8KRwYl063260;
 Thu, 8 Nov 2012 20:27:58 GMT (envelope-from nobody)
Message-Id: <201211082027.qA8KRwYl063260@red.freebsd.org>
Date: Thu, 8 Nov 2012 20:27:58 GMT
From: Nick Hibma <nick@anywi.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Subject: misc/173483: NanoBSD initialises /cfg incorrectly (wrong permissions)
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Nov 2012 20:30:01 -0000


>Number:         173483
>Category:       misc
>Synopsis:       NanoBSD initialises /cfg incorrectly (wrong permissions)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 08 20:30:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Nick Hibma
>Release:        8.3-RELEASE
>Organization:
AnyWi Technologies
>Environment:
System: FreeBSD bitske2.localdomain 8.3-RELEASE FreeBSD 8.3-RELEASE #0 r242660: Tue Nov 6 16:23:23 CET 2012 root@bitske2.localdomain:/usr/obj/usr/src/sys/GENERIC i386
>Description:
/cfg is initialised from /var/empty in NANO_CFGDIR is unset. This also copies
the 0555 permissions from this dir to /cfg.
>How-To-Repeat:
Build an image using NanoBSD with NANO_CFGDIR="" .
>Fix:
Index: nanobsd.sh
===================================================================
--- nanobsd.sh	(revision 12226)
+++ nanobsd.sh	(working copy)
@@ -413,12 +413,13 @@
 	dir=$2
 	mnt=$3
 	lbl=$4
-	test -z $2 && dir=${NANO_WORLDDIR}/var/empty
-	test -d $dir || dir=${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}
 )

>Release-Note:
>Audit-Trail:
>Unformatted: