From owner-svn-src-all@freebsd.org Mon Dec 7 04:02:34 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 655077FB9; Mon, 7 Dec 2015 04:02:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BFB813F0; Mon, 7 Dec 2015 04:02:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB742Xql082009; Mon, 7 Dec 2015 04:02:33 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB742XWD082007; Mon, 7 Dec 2015 04:02:33 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201512070402.tB742XWD082007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 7 Dec 2015 04:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291914 - head/tools/tools/nanobsd/embedded X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2015 04:02:34 -0000 Author: imp Date: Mon Dec 7 04:02:32 2015 New Revision: 291914 URL: https://svnweb.freebsd.org/changeset/base/291914 Log: Allow the .cfg files to specify the ultimate format for the images created. Modified: head/tools/tools/nanobsd/embedded/common head/tools/tools/nanobsd/embedded/qemu-i386.cfg Modified: head/tools/tools/nanobsd/embedded/common ============================================================================== --- head/tools/tools/nanobsd/embedded/common Mon Dec 7 04:02:31 2015 (r291913) +++ head/tools/tools/nanobsd/embedded/common Mon Dec 7 04:02:32 2015 (r291914) @@ -312,6 +312,7 @@ create_diskimage ( ) ( pprint 3 "log: ${NANO_OBJ}/_.di" ( + set -o xtrace if [ ! -z ${NANO_NOPRIV_BUILD} ]; then extra="-F ${NANO_OBJ}/_.metalog" fi @@ -348,17 +349,19 @@ create_diskimage ( ) ( fi eval $NANO_SLICE_CFG=freebsd eval $NANO_SLICE_ROOT=freebsd + [ -z ${NANO_DISKIMAGE_FORMAT} ] || fmtarg="-f ${NANO_DISKIMAGE_FORMAT}" + [ -z ${NANO_DISKIMAGE_FORMAT} ] || fmt=".${NANO_DISKIMAGE_FORMAT}" if [ ! -z "${NANO_SLICE_FAT}" ]; then - mkimg -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \ + mkimg -a 3 ${fmtarg} -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \ -p ${s2}:=${NANO_OBJ}/_.s2 \ -p ${s3}:=${NANO_OBJ}/_.s3 \ - -o ${NANO_OBJ}/_.disk.image.${NANO_NAME} + -o ${NANO_OBJ}/_.disk.image.${NANO_NAME}${fmt} else # s1 is cfg, s2 is /, not sure how to make that # boot (marked as active) with mkimg yet - mkimg -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \ + mkimg -a 2 ${fmtarg} -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \ -p ${s2}:=${NANO_OBJ}/_.s2 \ - -o ${NANO_OBJ}/_.disk.image.${NANO_NAME} + -o ${NANO_OBJ}/_.disk.image.${NANO_NAME}${fmt} fi ) > ${NANO_OBJ}/_.di 2>&1 ) Modified: head/tools/tools/nanobsd/embedded/qemu-i386.cfg ============================================================================== --- head/tools/tools/nanobsd/embedded/qemu-i386.cfg Mon Dec 7 04:02:31 2015 (r291913) +++ head/tools/tools/nanobsd/embedded/qemu-i386.cfg Mon Dec 7 04:02:32 2015 (r291914) @@ -37,6 +37,7 @@ NANO_KERNEL=GENERIC NANO_DRIVE=ada0 NANO_NAME=qemu-i386 +NANO_DISKIMAGE_FORMAT=qcow2 export EMBED_OMIT_FAT=t . common # Pull in common definitions, keep last