From owner-svn-src-all@FreeBSD.ORG Fri Sep 16 13:30:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33B35106564A; Fri, 16 Sep 2011 13:30:00 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id A9E458FC19; Fri, 16 Sep 2011 13:29:59 +0000 (UTC) Received: by yxk36 with SMTP id 36so3602916yxk.13 for ; Fri, 16 Sep 2011 06:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; bh=sP0PULj4IlP1cYRXyZFr9O6Dj0uTXsgMqoZQBzdfhMU=; b=HxRw0XYJZksvBwEmNbB3BG7bBGmmU+JhwTV5GZyPnSGzJigv3mTnsNTN1sxDAwuR1G sFd7EIFQqpDyDbP9xAanD9KBgM7GnUCM3FnRj/YO24XjamycHb0x6wAJB5ekzyN9QT4H OxEPX93xSmzG8V3DMxEJ5L1Zaa5tbOHhEb078= Received: by 10.43.44.72 with SMTP id uf8mr1771240icb.1.1316179796055; Fri, 16 Sep 2011 06:29:56 -0700 (PDT) Received: from starr-wireless.local (c-24-6-49-154.hsd1.ca.comcast.net. [24.6.49.154]) by mx.google.com with ESMTPS id o5sm9431395ibu.12.2011.09.16.06.29.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Sep 2011 06:29:54 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Garrett Cooper In-Reply-To: <201109160937.p8G9bDb3013489@svn.freebsd.org> Date: Fri, 16 Sep 2011 06:29:53 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <470110EF-3C4A-42D2-B2FE-3CE3836DAEBF@gmail.com> References: <201109160937.p8G9bDb3013489@svn.freebsd.org> To: Nathan Whitehorn X-Mailer: Apple Mail (2.1084) 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-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 16 Sep 2011 13:30:00 -0000 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 >=20 > Log: > Fix WPA setup broken by changes to shell argument passing inside the > installer network configuration. >=20 > PR: bin/159558 > Approved by: re (kib) >=20 > Modified: > head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 >=20 > 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 Fri Sep 16 = 09:15:34 2011 (r225611) > +++ head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Fri Sep 16 = 09:37:13 2011 (r225612) > @@ -35,6 +35,7 @@ >=20 > 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 Cheers, -Garrett=