Date: Mon, 6 Feb 2006 16:26:26 +0000 From: Ceri Davies <ceri@submonkey.net> To: Xin LI <delphij@FreeBSD.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/sysinstall tcpip.c Message-ID: <20060206162626.GJ21499@submonkey.net> In-Reply-To: <200602060649.k166nvJL015878@repoman.freebsd.org> References: <200602060649.k166nvJL015878@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--7ZAtKRhVyVSsbBD2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Feb 06, 2006 at 06:49:57AM +0000, Xin LI wrote:
> delphij 2006-02-06 06:49:57 UTC
>=20
> FreeBSD src repository
>=20
> Modified files:
> usr.sbin/sysinstall tcpip.c=20
> Log:
> Attempt to fix DHCP address acquisition which was broken by rev. 1.133.
> | @@ -596,9 +596,12 @@ netconfig:
> | ipv4_enable =3D TRUE;
> | if (ipv4_enable) {
> | sprintf(ifn, "%s%s", VAR_IFCONFIG, devp->name);
> | - if (use_dhcp)
> | - sprintf(temp, "DHCP %s", extras);
> | - else
> | + if (use_dhcp) {
> | + if (strlen(extras) > 0)
> | + sprintf(temp, "DHCP %s", extras);
> | + else
> | + sprintf(temp, "DHCP");
> | + } else
> | sprintf(temp, "inet %s %s netmask %s",
> | ipaddr, extras, netmask);
> | variable_set2(ifn, temp, 1);
Can you explain the failure mode?
network.subr doesn't deal with trailing spaces or something?
Ceri
--=20
That must be wonderful! I don't understand it at all.
-- Moliere
--7ZAtKRhVyVSsbBD2
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFD53iyocfcwTS3JF8RAmWmAJ0S/LRBd1tK74WKKpbZAEWrGumFSgCeP7a7
GVT4n4CKJKeAsfwEiROj7HM=
=UG1n
-----END PGP SIGNATURE-----
--7ZAtKRhVyVSsbBD2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060206162626.GJ21499>