From nobody Fri Oct 14 05:29:32 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MpZhS0wb4z4fdRx for ; Fri, 14 Oct 2022 05:29:44 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MpZhS0W8Wz3QmN for ; Fri, 14 Oct 2022 05:29:44 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665725384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1ta71ecUlD02nZ2HekFbnKVg8v+UYFNm/RClnl81VB4=; b=RUiFN5X/BYfHdwt8tv5ZAYbk2a2mNX5u0MYfc4M3HeSv5reR3C7cpGlFy1rx5BY1ZhUtWU lBm/zaWtEuh4jm9GZEyr1MR7LF1vfqrkrSTmECz27XlFhfMnOsroJabvhhLu+CMOIHnKpO V5FodRSXqXTuDhDN/3REiBpfyg7ldoDKJHV4PHo1CRABV4ZemLDBHPld/J3TFgtkziWQ/z WH1WL7XbbJAsBvEqyVisrvoXJ6SrDaGE3kr8Fez2bPWL5SGYeBX1HjxKETppPzEButAbGe /jrPKkLQ49E2T+ecStIYSuYOG9fnXPk3jUkOQ+RK3aaezrWVjvu30StZZhKCUg== Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 1D4" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MpZhR6Ypkz1C8K for ; Fri, 14 Oct 2022 05:29:43 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f181.google.com with SMTP id x13so1823569qkg.11 for ; Thu, 13 Oct 2022 22:29:43 -0700 (PDT) X-Gm-Message-State: ACrzQf1VwTJaq8gxEvsQWzVW5HqOoPZ0D6Lxaf/UQgcn4FBHIl7/uluG uilqfiYMw47T7XDH6shHReB27k8opK/du/YDzxs= X-Received: by 2002:a05:620a:4726:b0:6e7:f8ca:86ec with SMTP id bs38-20020a05620a472600b006e7f8ca86ecmt2639142qkb.96.1665725383109; Thu, 13 Oct 2022 22:29:43 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202210140526.29E5QNmi041783@gitrepo.freebsd.org> In-Reply-To: <202210140526.29E5QNmi041783@gitrepo.freebsd.org> From: Kyle Evans Date: Fri, 14 Oct 2022 00:29:32 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 12b92f3ed82a - main - bsdinstall: use the correct DISTDIR for fetching local distfiles Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665725384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1ta71ecUlD02nZ2HekFbnKVg8v+UYFNm/RClnl81VB4=; b=j8Esrh8dS/LjQ3nQygLien7apPA8ydvfw/IUcIs/9d/AlfxALbhNQeWc2cyOp77e3Dkv6m Mo4k43YtIfIbixNyObUGG15o4GCRG9sdHXjtK03Q+u3pIZ4Xtg2GMReLjI3NzD6joCmSHd AL42/L5wBbIK9ZpLLffaYK0Ld8dkMcXycOx4EXp966xxBiLhcElqOYe3Oi618nHob8abVO NxjfSKPSwUB3oHTdF1z9lGus4v5+EK/zzcda9hBxlmHN1x0ObenJs3pPj4pvrhuWtan14N 5qLG7LqTob5myxeXUOG5Jgk5e4EsQ+QOWxH85L36GyAO/toQ900sMKOQHdaZPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665725384; a=rsa-sha256; cv=none; b=ZQ2mn1OK+TpK4z1pDP1zBay//v/AtjuCDd9Ep6RGmrci28VazNDsihyjD0LZD9pdSBbt7K fiVqa+2Z8rvq63M8xA7LmbuHiK25SdQ8D34Ea1Z0OvOx8I7JGEBqCekKPKqSfHWS4qRnKH mnOGMQYxZkDyw0xrRqdFADjOtcEhzCIUglaKBzCHMULvbh8kBcv1XCqx8KRztczN4EFh+4 ob/HBskRMP4NnS1iOYswJ7+nyE5AO2P9dr+G0SKy/vov/o32upOgNGPepB3eU7Z80pcwHK dNz6UZp7B5d12rV9qw2btwQqzv6iS66viqOM2brksjXvjl2/TJ/c58e2QOu82g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Fri, Oct 14, 2022 at 12:26 AM Kyle Evans wrote: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=12b92f3ed82aa71c0eba246ce3053ef225724570 > > commit 12b92f3ed82aa71c0eba246ce3053ef225724570 > Author: Kyle Evans > AuthorDate: 2022-10-14 05:22:09 +0000 > Commit: Kyle Evans > CommitDate: 2022-10-14 05:22:09 +0000 > > bsdinstall: use the correct DISTDIR for fetching local distfiles > > fetchmissingdists naturally sets BSDINSTALL_DISTDIR to a directory in > the new filesystem that it can write fetched distfiles to. As a result, > BSDINSTALL_DISTSITE was incorrectly set to the scratch space on /mnt for > the call to distfetch when grabbing local distfiles, and it would > subsequently fail. > > Switch to using the copy of BSDINSTALL_DISTDIR that we stashed off > coming into fetchmissingdists; this one is in-fact set to the path where > the local distfiles are stored. > > Patch suggested by jrtc27. > > Reported and tested by: Daniel O'Connor > MFC after: 1 week Bah, this got dropped: Fixes: 40923b0c81cc ("Fix scripted installation from media...") Thanks, Kyle Evans