From nobody Fri Jan 19 15:46:18 2024 X-Original-To: dev-commits-src-branches@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 4TGkVf5g4Gz56lS2; Fri, 19 Jan 2024 15:46:18 +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 4TGkVf572Tz58HR; Fri, 19 Jan 2024 15:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705679178; 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=/t1EUviA3KFZBPyp7AZKG0fREile/30/PW8kRLvXY00=; b=IxYm9wHT5UC8cokZYiU73ENSLkxQYrVHt6ZIPkQwwXvqpQ6FBSAvVl6ZHs4usOhxffkmsJ a0qx+kgxShjuVgQFYwSBwYY43dWfTtk/k9cRwhRFvg6IY38fbz/2VYGAxiIpgmoLFZEIyi pozrn+Ra26HlVvrGqc8PWKxp4YMB8+AhvADroSMK89INlWerOeBTOv4SaFkmGnuWbWVFf8 ylAlshoUJZnAywe5RiO+okj+jAZzvqSucI8IdLURvj5hxtBwyfDzmQWp8Jqbqz42CcpgPo flda1hW8AUX5RQwUfv9QPg7BQtA97LV7iXa8A8ET3I78clSLDLButBNy/w00Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705679178; 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=/t1EUviA3KFZBPyp7AZKG0fREile/30/PW8kRLvXY00=; b=qd8ZsDDjmJDoLeVULvVdCkahlxoB4lokSxruthEl5TmhCH1OTHLwxPnh19O1OTA0n8r9Ag 0KeUW6jxnlxwi1Wx0xGqZNzMgZTfbiCDnAEWuClsF6Csxxetm6S5SUAuLDj2Ve9b8MbnHc /V2FHkH+hlzSv0z+K+uAX2JVauBxIKW2MgQwfvsbW85BcQOTI067gpmV6zZx0ORF5RLUKl SPETvk6J9anO3Zy242sehmRspiq6n/02MqLtBET6hzxB4jjo7ab0UcckJUwIfETZrLxlN0 /7rMn+tooxuDgIIVm6cci2Syy2x02I0NIdOnOd+O8G212HFCfY88sAyHzib4qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705679178; a=rsa-sha256; cv=none; b=uG7KudHKebeCpDUKh5XYz0OAUASYlX63g1lZvSBccZhRLZ/Ulf47jAonX2rYnwJ+YcpY8q OaQj6Eoig7QOGlzOu+cXQN+8LTsVa3ujLGQ1UJ3Ui3LbZiQvy5Vmxrq3zHrmMr4EnMWu4l M+g47FGg9ZCo+v7w05c+ZPKneZOKqa6owA/CJIXMx8kIPAiBUv9eBJLNYrreP0PefMw80/ OCg/tGALIuqjv4B2cuqv4lFVDzj6Epv8D+iEXPOmZYcwlwPeBlG/RbXEaRc02Nekye/9Jr mS1LDcJ9MxGWLcuuKOBv2C7HGpKt2gQGXfa6wqFoRFg9kdAhx4mM+bpKka6SVw== 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 4TGkVf49T7zx7L; Fri, 19 Jan 2024 15:46:18 +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 40JFkIAK041769; Fri, 19 Jan 2024 15:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JFkIfW041766; Fri, 19 Jan 2024 15:46:18 GMT (envelope-from git) Date: Fri, 19 Jan 2024 15:46:18 GMT Message-Id: <202401191546.40JFkIfW041766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cheng Cui Subject: git: 404b91dac415 - stable/14 - libexec/rc/rc.initdiskless: make tar's path flexible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 404b91dac415c5c9126fb4201145049c4d3dfbba Auto-Submitted: auto-generated The branch stable/14 has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=404b91dac415c5c9126fb4201145049c4d3dfbba commit 404b91dac415c5c9126fb4201145049c4d3dfbba Author: Cheng Cui AuthorDate: 2023-11-24 15:47:18 +0000 Commit: Cheng Cui CommitDate: 2024-01-19 10:45:28 +0000 libexec/rc/rc.initdiskless: make tar's path flexible PR: 274977 (cherry picked from commit 93b7818226cf5270646725805b4a8c17a1ad3761 and from commit a04ca1c229195c7089b878a94fbe76505ea693b5) --- 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..8b4a01187636 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