Date: Sat, 12 Dec 2015 08:55:59 +0100 From: =?UTF-8?Q?Olivier_Cochard=2DLabb=C3=A9?= <olivier@cochard.me> To: Warner Losh <imp@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r291913 - head/tools/tools/nanobsd Message-ID: <CA%2Bq%2BTcrSPfGgwy5majfhHZUdKiE4iO8rmkkJY3dzGWTUFut5yQ@mail.gmail.com> In-Reply-To: <201512070402.tB742V3Z081964@repo.freebsd.org> References: <201512070402.tB742V3Z081964@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Dec 7, 2015 at 5:02 AM, Warner Losh <imp@freebsd.org> wrote: > Author: imp > Date: Mon Dec 7 04:02:31 2015 > New Revision: 291913 > URL: https://svnweb.freebsd.org/changeset/base/291913 > > Log: > Generally use shorter, more idiomatic sh expressions in a bunch of > places. > > Modified: > head/tools/tools/nanobsd/defaults.sh (contents, props changed) > =E2=80=8BHi, I beleive there is a tipo here : =E2=80=8B > > Modified: head/tools/tools/nanobsd/defaults.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/defaults.sh Mon Dec 7 04:02:19 2015 > (r291912) > +++ head/tools/tools/nanobsd/defaults.sh Mon Dec 7 04:02:31 2015 > (r291913) > > ####################################################################### > @@ -949,21 +949,21 @@ export_var ( ) { # Don't wawnt a subshe > # Call this function to set defaults _after_ parsing options. > # dont want a subshell otherwise variable setting is thrown away. > set_defaults_and_export ( ) { > - test -n "${NANO_OBJ}" || NANO_OBJ=3D/usr/obj/nanobsd.${NANO_NAME} > - test -n "${MAKEOBJDIRPREFIX}" || MAKEOBJDIRPREFIX=3D${NANO_OBJ} > - test -n "${NANO_DISKIMGDIR}" || NANO_DISKIMGDIR=3D${NANO_OBJ} > + : ${NANO_OBJ:=3D/usr/obj/nanobsd.${NANO_NAME}} > + : ${MAKEOBJDIRPREFIX:=3D${NANO_OBJ}} > + : ${NANO_DISKIMGDIR=3D:${NANO_OBJ}} > NANO_WORLDDIR=3D${NANO_OBJ}/_.w > NANO_MAKE_CONF_BUILD=3D${MAKEOBJDIRPREFIX}/make.conf.build > NANO_MAKE_CONF_INSTALL=3D${NANO_OBJ}/make.conf.install > > =E2=80=8BNotice the line: : ${NANO_DISKIMGDIR=3D:${NANO_OBJ}} I beleive the good one is: : ${NANO_DISKIMGDIR=3D${NANO_OBJ}} =E2=80=8B(without the ':' before ${NANO_OBJ}} Because with the ':' variable NANO_DISKIMGDIR includes the ':' in front of its values, and dd didn't like it: + IMG=3D:/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img + MNT=3D/usr/obj/BSDRPcur.amd64/_.mnt + mkdir -p /usr/obj/BSDRPcur.amd64/_.mnt + [ file '=3D' swap ] + echo 'Creating md backing file...' Creating md backing file... + rm -f :/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img + echo 'NANO RM -f :/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img= ' NANO RM -f :/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img + uname -r + command rm -x -f :/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img + dd 'if=3D/dev/zero' 'of=3D:/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img' 'seek=3D1000000' 'count=3D0' dd: :/usr/obj/BSDRPcur.amd64/BSDRP-1.9998-full-amd64-vga.img: No such file or directory Regards, Olivier
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2Bq%2BTcrSPfGgwy5majfhHZUdKiE4iO8rmkkJY3dzGWTUFut5yQ>