From nobody Thu Feb 02 17:35:31 2023 X-Original-To: dev-commits-src-all@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 4P75Xg52r0z3kPJC; Thu, 2 Feb 2023 17:35:31 +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 4P75Xg4Z9Cz3xrY; Thu, 2 Feb 2023 17:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675359331; 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=D/yapCJU9sqR/DmQhJw3VnAJ7D6jx//SAd+rKbzT9Uk=; b=OfFUvg7rCDZhLjepvcsfvlzfvSWLgim9O94IrvcrlA+wHKRjz1E3QlywWP5c3N3R1TVOIi qMlfF0eLbUJfYlCPUt83F14OU2gj9a8mBb5jzrMt/MvSBvADARGiWwxrF4ktFl8OI4Y8T7 WnFVi560U0hTrjQaMtJALHoOPDd3FWAGAyRw8OiPnaeQ3+Jo3CUiBn0R5gvVRuFpuyDx1v TgQRyz9xYUdwPfLS2+aKMeNvV3nuNJ/1BBokGl0r+6/RBHPd20AL3FESahfpl0Nl5pnwC6 qM2SqmvAlwZ2MqMIDRe3g4ozhCBMnKI5b8Q79pZka395sHuiXoxMv6g7s8UfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675359331; 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=D/yapCJU9sqR/DmQhJw3VnAJ7D6jx//SAd+rKbzT9Uk=; b=dvebI6uozdj2joy12KeAn42khLFQDL2zoYLWolFSTYqKtFKCAzEzUHcuSsi5tcxGff/GKR MAdJPnnNxtVtsG4HwCuOZUjsbcfFqVx8OlmDRx8VZZjaxfdHyEbKzE2pvLr5fq+BIoKxtx sAif3PltT7S3LmuwWFkkFJU+5rHjovylDjJr46wrZC61sk6anTQ2WlrsneABXlEpjldkZL WtGQatXHiC+VaywOrqcnijL9NWqKafWka5yGqSGrfhpVZPWYKoxx3CotO7mLLisiBhh69k 0oUT6TwUvy6/lUjY+F3Jldl2JIn6co38q9Ui1NaRyMQ95QUBQy+WYx0i66Is8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675359331; a=rsa-sha256; cv=none; b=cnQCfFAEVXm4ipNejqlylvbiqjQZOkJ29FrWD+9TPWZpAuOkk4Yt1WlMSZkL7bwFQLdQ6T Pxwc4tP9RoOAL/zkMtwlyEBRk1F+xuo99LmPUUKM+Ot3R8AYL4ro8VF6GkEXUPkTAYdjxP NB38CgW/2LfGUVLbyE/zESq4qTSkO4EjwDA4xlnXtKtjiyQzDZhWxwcPTn4KLiiHUsIVXG /t0pJ05UXCr2w5tcul978FyWS+CqoT8DTqjy9XVpuMnSzsbB1KsfgGd9IlHunAvHtupo65 QI/YorrqqkFYLDICuEbxVOTaVzHzZsBLEqVkDzuU+SaVrxtX51b4nr2Aic26cw== 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 4P75Xg3FHXz12g7; Thu, 2 Feb 2023 17:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 312HZVLN021410; Thu, 2 Feb 2023 17:35:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312HZVgk021409; Thu, 2 Feb 2023 17:35:31 GMT (envelope-from git) Date: Thu, 2 Feb 2023 17:35:31 GMT Message-Id: <202302021735.312HZVgk021409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e7ab133648a1 - main - timeout: Move from /usr/bin to /bin List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7ab133648a168c4bf7c11da840663c5581771d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e7ab133648a168c4bf7c11da840663c5581771d8 commit e7ab133648a168c4bf7c11da840663c5581771d8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-02-01 15:24:59 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-02-02 17:34:35 +0000 timeout: Move from /usr/bin to /bin timeout(1) is used by /etc/rc.d/zfskeys. Unfortunately, having timeout(1) installed in /usr/bin causes problems when /usr is an encrypted ZFS partition. Implementing timeout(1) in sh(1) is not trivial. A more elegant solution is to move timeout(1) to /bin so that it is available to early services in the boot process. PR: 265221 Reviewed by: allanjude, des, imp Approved by: allanjude, des, imp Reported by: Ivan Fixes: 33ff39796ffe Add zfskeys rc.d script for auto-loading encryption keys MFC after: 1 week Relnotes: yes Sponsored by: Modirum MDPay Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D38344 --- ObsoleteFiles.inc | 4 ++++ bin/Makefile | 1 + {usr.bin => bin}/timeout/Makefile | 2 ++ {usr.bin => bin}/timeout/Makefile.depend | 0 {usr.bin => bin}/timeout/tests/Makefile | 0 {usr.bin => bin}/timeout/tests/Makefile.depend | 0 {usr.bin => bin}/timeout/tests/timeout_test.sh | 0 {usr.bin => bin}/timeout/timeout.1 | 0 {usr.bin => bin}/timeout/timeout.c | 0 etc/mtree/BSD.tests.dist | 4 ++-- usr.bin/Makefile | 1 - 11 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index bf96963c3e73..ed6d929dd79b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20230201: timeout moved from /usr/bin to /bin +OLD_FILES+=usr/tests/usr.bin/timeout/Kyuafile +OLD_FILES+=usr/tests/usr.bin/timeout/timeout_test + # 20230124: rtalloc.9 removed OLD_FILES+=usr/share/man/man9/rtalloc.9.gz diff --git a/bin/Makefile b/bin/Makefile index 3ad97ac8d624..cdd96d0b84e8 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -38,6 +38,7 @@ SUBDIR= cat \ stty \ sync \ test \ + timeout \ uuidgen SUBDIR.${MK_SENDMAIL}+= rmail diff --git a/usr.bin/timeout/Makefile b/bin/timeout/Makefile similarity index 69% rename from usr.bin/timeout/Makefile rename to bin/timeout/Makefile index fc1c87edfb7a..2eb88d6827fa 100644 --- a/usr.bin/timeout/Makefile +++ b/bin/timeout/Makefile @@ -4,6 +4,8 @@ PROG= timeout +SYMLINKS= ../..${BINDIR}/timeout /usr/bin/timeout + HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/timeout/Makefile.depend b/bin/timeout/Makefile.depend similarity index 100% rename from usr.bin/timeout/Makefile.depend rename to bin/timeout/Makefile.depend diff --git a/usr.bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile similarity index 100% rename from usr.bin/timeout/tests/Makefile rename to bin/timeout/tests/Makefile diff --git a/usr.bin/timeout/tests/Makefile.depend b/bin/timeout/tests/Makefile.depend similarity index 100% rename from usr.bin/timeout/tests/Makefile.depend rename to bin/timeout/tests/Makefile.depend diff --git a/usr.bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh similarity index 100% rename from usr.bin/timeout/tests/timeout_test.sh rename to bin/timeout/tests/timeout_test.sh diff --git a/usr.bin/timeout/timeout.1 b/bin/timeout/timeout.1 similarity index 100% rename from usr.bin/timeout/timeout.1 rename to bin/timeout/timeout.1 diff --git a/usr.bin/timeout/timeout.c b/bin/timeout/timeout.c similarity index 100% rename from usr.bin/timeout/timeout.c rename to bin/timeout/timeout.c diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index b4b18997b7f9..910db16f0d15 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -62,6 +62,8 @@ .. test .. + timeout + .. .. cddl lib @@ -1106,8 +1108,6 @@ .. tar .. - timeout - .. tr .. truncate diff --git a/usr.bin/Makefile b/usr.bin/Makefile index a53d908d454b..cb7d414c81f8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -152,7 +152,6 @@ SUBDIR= alias \ tcopy \ tee \ time \ - timeout \ tip \ top \ touch \