Date: Fri, 16 Sep 2011 14:36:19 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: Nathan Whitehorn <nwhitehorn@freebsd.org> 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 Message-ID: <CAGH67wSzfWA5aeswQ27Eed4AYJyqcdydnfsyy00v2oytbBw1tw@mail.gmail.com> In-Reply-To: <470110EF-3C4A-42D2-B2FE-3CE3836DAEBF@gmail.com> References: <201109160937.p8G9bDb3013489@svn.freebsd.org> <470110EF-3C4A-42D2-B2FE-3CE3836DAEBF@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Sep 16, 2011 at 6:29 AM, Garrett Cooper <yanegomi@gmail.com> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wSzfWA5aeswQ27Eed4AYJyqcdydnfsyy00v2oytbBw1tw>