From owner-svn-src-all@freebsd.org Sat Jul 11 15:44:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F203E367023; Sat, 11 Jul 2020 15:44:43 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3vNq21Qmz45c5; Sat, 11 Jul 2020 15:44:43 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wr1-x433.google.com with SMTP id r12so8802193wrj.13; Sat, 11 Jul 2020 08:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=4i28J6n4cxkSye5q3iZiF8LxUw8sCGcHghGF4F9lQf0=; b=uO9txqc6OI+Dff8shubksuKXcdhHI72aZKYquByM4TE2NeAqcg9I3PYqm3PwSN0XJa bw6Aik62YadlVMIWW9ZuFg/+VewRabyGAt2qXvUryTRT0gPRuKr56jDrHNN+dKRukXQl qH83Run5AGajyCaoVRMkuy3VnQ/GMfr1wwml+b3RLypNfuZsqdDRVczNadmlFe1zNcZw jvfP+A3lwg+knK4Y7dt494vIrT3f6h7sqNKL/M9d+rQIhuV4fhk71mEslLPWyL4ui8oZ gfnuNYGC9trBuJoZ9HlSuaszCOgqMQLzeztsdsgPWA21G6InDi9NL4vopeij70KFccj/ lEaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=4i28J6n4cxkSye5q3iZiF8LxUw8sCGcHghGF4F9lQf0=; b=i/O1GTOne2A1siDCAiAJ/kyLBf63Ot/uIFaKT9w+fPHxJVTL0QH0h25WSQBGHUMaNf DGdy9q+uSAUMdhI9OFRf7lggi/QgnQwIGlE7O3cFDqp7vr6s5vrhJ4BhnP3hIlS/kVh1 rTyDvESTS8bXHweswOhjwnqJfZJ6yHhvLdiJBK7yZExrZJkwhD30T84BhvuWU/uzeuiv y6I8tQKwVxSd/8stonKLzhEL0YFqBmf68JTBGcbxrdPQK/1RITHyj/geYdrjr58MyZGG fHRlOFjzUH32GNyICNSuHC+2rrvFOE3U8QmxJm0ZuHFiLET2mOlAT3sKc1jfhQYw4pr7 Wghw== X-Gm-Message-State: AOAM5316yZcEQlrph7yuAK2LEonnv7uo3fN1ws9KgokSdUcD8yNuv7fo dm/c4XlEJllTiHIyHjKHTD70H2AwGywCGn+9XzAzFw== X-Google-Smtp-Source: ABdhPJzUvGqI2asjoia3ktHH7VWDdL6A/fer/ZCoJZR+ImcWKAG14z3oQIlqgQQPQf0v+7hZ2b9DRpVF/1YHXQQvIu0= X-Received: by 2002:adf:f311:: with SMTP id i17mr75575167wro.237.1594482281421; Sat, 11 Jul 2020 08:44:41 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:adf:9d84:0:0:0:0:0 with HTTP; Sat, 11 Jul 2020 08:44:40 -0700 (PDT) In-Reply-To: <202007111532.06BFWr7Y041417@repo.freebsd.org> References: <202007111532.06BFWr7Y041417@repo.freebsd.org> From: Mateusz Guzik Date: Sat, 11 Jul 2020 17:44:40 +0200 Message-ID: Subject: Re: svn commit: r363097 - head/usr.sbin/bsdinstall/scripts To: Allan Jude Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4B3vNq21Qmz45c5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 11 Jul 2020 15:44:44 -0000 On 7/11/20, Allan Jude wrote: > Author: allanjude > Date: Sat Jul 11 15:32:53 2020 > New Revision: 363097 > URL: https://svnweb.freebsd.org/changeset/base/363097 > > Log: > bsdinstall: kill dhclient before starting a new instance > > PR: 205821 > Submitted by: William Orr > MFC after: 2 weeks > Sponsored by: Klara Inc. > Event: July 2020 Bugathon > Differential Revision: https://reviews.freebsd.org/D14572 > > Modified: > head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 > > Modified: head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 > ============================================================================== > --- head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Sat Jul 11 14:55:11 > 2020 (r363096) > +++ head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 Sat Jul 11 15:32:53 > 2020 (r363097) > @@ -51,7 +51,7 @@ if [ $? -eq $DIALOG_OK ]; then > if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then > ifconfig $INTERFACE up > dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP > lease..." 0 0 > - err=$( dhclient $INTERFACE 2>&1 ) > + err=$( pkill dhclient; dhclient $INTERFACE 2>&1 ) > if [ $? -ne 0 ]; then > f_dprintf "%s" "$err" > dialog --backtitle 'FreeBSD Installer' --msgbox "DHCP lease acquisition > failed." 0 0 There can be more than one dhclient running, but this will kill everything. -- Mateusz Guzik