svn commit: r225612 - head/usr.sbin/bsdinstall/scripts

[Garrett Cooper]

On Fri, Sep 16, 2011 at 6:29 AM, Garrett Cooper <yanegomi at 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:
>>  Fix WPA setup broken by changes to shell argument passing inside the
>>  installer network configuration.
>>
>>  PR:          bin/159558
>>  Approved by: re (kib)
>>
>> Modified:
>>  head/usr.sbin/bsdinstall/scripts/netconfig_ipv4
>>
>> Modified: head/usr.sbin/bsdinstall/scripts/netconfig_ipv4
>> ==============================================================================
>> --- 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 @@
>>
>> INTERFACE=$1
>> IFCONFIG_PREFIX="$2"
>> +test -z "$IFCONFIG_PREFIX" || IFCONFIG_PREFIX="$2 "
>
> You can replace the above two lines with:
>
> IFCONFIG_PREFIX=${IFCONFIG_PREFIX:-$2}
>
> Example:
>
> starr-wireless:~ gcooper$ set -- "" ""
> starr-wireless:~ gcooper$ IFCONFIG_PREFIX=foo
> starr-wireless:~ gcooper$ IFCONFIG_PREFIX=${IFCONFIG_PREFIX:-$2}
> starr-wireless:~ gcooper$ echo $IFCONFIG_PREFIX
> foo
> starr-wireless:~ gcooper$ set -- "" "a"
> starr-wireless:~ gcooper$ IFCONFIG_PREFIX=
> starr-wireless:~ gcooper$ IFCONFIG_PREFIX=${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=${2:+$2 }

Thanks,
-Garrett