From owner-svn-src-head@FreeBSD.ORG Fri Sep 16 21:36:21 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 5C95C106564A; Fri, 16 Sep 2011 21:36:21 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id D55BD8FC1B; Fri, 16 Sep 2011 21:36:20 +0000 (UTC) Received: by qyk4 with SMTP id 4so4825471qyk.13 for ; Fri, 16 Sep 2011 14:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=qd0o9HprGgD5B9HxA+/T4DtqZzEesqfqnw9fpBw9SQs=; b=Hy+TT/0XTpX6JlEGSZY2HK+06Anu0ZAkb4GYP33vSo8Cc4NO6kLHbTtLt17jmEQW6x EvbhnhfE1/vJqxgwW0jCHITk6yeKVpy6AilnVJanlsq+8C3HGH0BrDlPh6Ktwdm+IPzK NaDWTJUrgqXm3X1b5n+BDqEU6HOOvY8c5DNTQ= MIME-Version: 1.0 Received: by 10.224.18.203 with SMTP id x11mr2282913qaa.92.1316208979952; Fri, 16 Sep 2011 14:36:19 -0700 (PDT) Received: by 10.224.37.83 with HTTP; Fri, 16 Sep 2011 14:36:19 -0700 (PDT) In-Reply-To: <470110EF-3C4A-42D2-B2FE-3CE3836DAEBF@gmail.com> References: <201109160937.p8G9bDb3013489@svn.freebsd.org> <470110EF-3C4A-42D2-B2FE-3CE3836DAEBF@gmail.com> Date: Fri, 16 Sep 2011 14:36:19 -0700 Message-ID: From: Garrett Cooper To: Nathan Whitehorn Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225612 - head/usr.sbin/bsdinstall/scripts 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: Fri, 16 Sep 2011 21:36:21 -0000 On Fri, Sep 16, 2011 at 6:29 AM, Garrett Cooper wrote: > On Sep 16, 2011, at 2:37 AM, Nathan Whitehorn wrote: > >> Author: nwhitehorn >> Date: Fri Sep 16 09:37:13 2011 >> New Revision: 225612 >> URL: http://svn.freebsd.org/changeset/base/225612 >> >> Log: >> =A0Fix WPA setup broken by changes to shell argument passing inside the >> =A0installer network configuration. >> >> =A0PR: =A0 =A0 =A0 =A0 =A0bin/159558 >> =A0Approved by: re (kib) >> >> Modified: >> =A0head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 >> >> Modified: head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 >> =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/usr.sbin/bsdinstall/scripts/netconfig_ipv4 =A0 Fri Sep 16 09:15= :34 2011 =A0 =A0 =A0 =A0(r225611) >> +++ head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 =A0 Fri Sep 16 09:37= :13 2011 =A0 =A0 =A0 =A0(r225612) >> @@ -35,6 +35,7 @@ >> >> INTERFACE=3D$1 >> IFCONFIG_PREFIX=3D"$2" >> +test -z "$IFCONFIG_PREFIX" || IFCONFIG_PREFIX=3D"$2 " > > You can replace the above two lines with: > > IFCONFIG_PREFIX=3D${IFCONFIG_PREFIX:-$2} > > Example: > > starr-wireless:~ gcooper$ set -- "" "" > starr-wireless:~ gcooper$ IFCONFIG_PREFIX=3Dfoo > starr-wireless:~ gcooper$ IFCONFIG_PREFIX=3D${IFCONFIG_PREFIX:-$2} > starr-wireless:~ gcooper$ echo $IFCONFIG_PREFIX > foo > starr-wireless:~ gcooper$ set -- "" "a" > starr-wireless:~ gcooper$ IFCONFIG_PREFIX=3D > starr-wireless:~ gcooper$ IFCONFIG_PREFIX=3D${IFCONFIG_PREFIX:-$2} > starr-wireless:~ gcooper$ echo $IFCONFIG_PREFIX > a I didn't see the trailing space that was added. jilles@ noted that this form is usable though (and I agree): IFCONFIG_PREFIX=3D${2:+$2 } Thanks, -Garrett