From nobody Fri Dec 15 13:47:34 2023 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 4Ss9Wq2BqLz52qbS; Fri, 15 Dec 2023 13:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ss9Wq1kpnz4Gcb; Fri, 15 Dec 2023 13:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702648055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eee+FfYkM0DXvcUirBSVSlmz0kw5YcbKQfcTiPGTiWo=; b=XPForr/2doRtVxMQBoC3yOUeJwKwGYLqljNX7TM4a5Q7lWiqnyLxLbKQ4hBJlFwPTHpZMt /IdN7MMCBcqEx8wcGMCP/2mY9GD+Dqj8X+pNC0mpyek+1U0DEVD8PdYx+ubFFzbWqZ0vRD HM4lxaLxQH7LlS9cpV6e9izCRxr/JXZTg/UJxeYw3EJvN6skxkh56jJA7UPElKVthYCABC xJRUT1jeiJ+KA37AxFN0SKXRycqPdMkSh9TaQz5TedF69aeMu4unU32OFEM/qAqxqJ6xF6 R/WLOKptRbtMy+1jHBVBvwTNGaZCHMRi8SrDbOK/l13l9YZCUrJc+ccVQfCpQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702648055; a=rsa-sha256; cv=none; b=vEUabM/hS5nXiLc9w5IT3tUy0KNFcW/4UlyOUtpmBEMvSvgWH4G4bhvfPMQ3CkbudnLBjK UvIQ9yIapCn090NkALAZHHGOFj7Cm21GRsikG5YGIiOnTPF4zquczd1ddc5/KZfspg7Wmb X+Z1Q+CK/2LK6WJEyiwiMW/wOZ7VbhXwHbevIi0ygesnZ/eSDILw4Z8V+iLP7vHfQS/IXA MUWPDI7rdsQleZkfIO7qyNVy34yUNBSGSSkOPHRg/SM61Yi13X8iPvvfFsGC1ViY1uc0t3 QaVqkeD43G44btOx67g50lCRIYlhjyXa8fSr5LE4Ly19N3H5Uy3rvAhDfpDhVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702648055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eee+FfYkM0DXvcUirBSVSlmz0kw5YcbKQfcTiPGTiWo=; b=n7Chderb/U4BxcYhV6oEuKUHEsyi5+8cJdwPWkcseC1vpwXG2J8UAecJwWdY6KS4ZVd9pf PC39SVaQOr1ZMgg2XrKZwIryCaGniTVp7KXkSlnRSLuAnk1qeN703/k5OmvrE38ty0sgjX wh4FxYOmOpcuKKZGjS+Rm8IOD81STdkH53U6fId/hYULASpUA2HK6GagjFye6fwHM/qJ2w s1OeCf0fDVH0JX1AkGgyugnzrCUQ50MFyckyDWuDd3pAkhULW8jrMU7Tt1HbvDSWMf5lDQ rUxH4HD22Q2f6UtuKkHekD0f/2MHg9cQVyWfLuvdV6E9p6upesxy0Ufu4Fjr7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ss9Wq0hcjz1BZv; Fri, 15 Dec 2023 13:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BFDlYEC098037; Fri, 15 Dec 2023 13:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFDlY5Z098034; Fri, 15 Dec 2023 13:47:34 GMT (envelope-from git) Date: Fri, 15 Dec 2023 13:47:34 GMT Message-Id: <202312151347.3BFDlY5Z098034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 93b7818226cf - main - libexec/rc/rc.initdiskless: make tar's path flexible 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93b7818226cf5270646725805b4a8c17a1ad3761 Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=93b7818226cf5270646725805b4a8c17a1ad3761 commit 93b7818226cf5270646725805b4a8c17a1ad3761 Author: Cheng Cui AuthorDate: 2023-11-24 15:47:18 +0000 Commit: Cheng Cui CommitDate: 2023-12-15 08:46:44 +0000 libexec/rc/rc.initdiskless: make tar's path flexible Summary: PR: 274977 Reviewed by: rgrimes,imp Approved by: rgrimes MFC after: 1 month --- libexec/rc/rc.initdiskless | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.initdiskless b/libexec/rc/rc.initdiskless index 9b37497c1e7e..ee891c3f782e 100644 --- a/libexec/rc/rc.initdiskless +++ b/libexec/rc/rc.initdiskless @@ -362,6 +362,8 @@ done # so if the cpio archive is present, it prevents the files from dir/ # from being copied. ++PATH=${PATH}:/rescue + for i in ${templates} ; do for j in /conf/$i/* ; do subdir=${j##*/} @@ -376,7 +378,7 @@ for i in ${templates} ; do if [ -f $j ]; then create_md $subdir echo "Loading /$subdir from cpio archive $j" - (cd / ; /rescue/tar -xpf $j) + (cd / ; tar -xpf $j) fi done for j in /conf/$i/*/extract ; do