From nobody Tue Feb 7 17:41:32 2023 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 4PB9RK29c4z3nV8g; Tue, 7 Feb 2023 17:41:33 +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 4PB9RK1ZFrz4H9H; Tue, 7 Feb 2023 17:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675791693; 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=60nvd4w1p1rZJ/o7xjOjEsAhOkwV+jp+IXipXdGAtcY=; b=BPbGxQj+oJxVcfr9zxhQtJQYeXf7y9k4w8Iu23Se2GgnmBbyrgot0ElV0MyR3/PV/jmqB1 10ay3fjPZH0q6kB/hKqP6b+AtlstDZU8YZcaXjM6X5RJ9x74jvebex6EERkhZnJXgerUWb pH25EmbRPKRYjpfPeqMZvKxQVSZO8ZqkJEcQGscF+0ckpv5V4Uo8IZ5mCQtCx1VccHBlOs DrkFt/0Veu0+NQGs6SINmjVPg6YLGGng4v2p7pDzpg1R1WELti3G223s+i07iynlRpGOz+ EjFCL0pTSdRDxfNEb0x2RT5sPW6eWoSoggSYOmhpW7tqPq9wSJD+KSA4MA1xAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675791693; 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=60nvd4w1p1rZJ/o7xjOjEsAhOkwV+jp+IXipXdGAtcY=; b=DE5M++Qpr4GDMdCgezyJyzpaoYy4GMtswDxm/g0sokV5de1mUlEqMQo2c3qJRHgBmiMOdb WWai1SgwS30h0phnwd/sWpKL/wCzG4il8fWmEVvKkgF7YXMYdiTi13zgjBRTHJR522keUP hSWmj86t7RBN449hxqx5KpaIlGDPi702Xjx/4hXi9GZNlRl6zTPDsZhSg1/eOgyAiDgERm U8Zyli2uOTx2t0bXCrLUY12meSbLZoFKp7MZQ3spnjfeDv+I2dbDydZBs5/lsCZHl6sy3K nX83qTjgbt4Kt+2BDOUKG+/Y6rjnmDNmhVdm66kKPSjWhQxx+TasJBn1ZG0RCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675791693; a=rsa-sha256; cv=none; b=q7Curxr5EFuN4qSgo8ylFI9aUGl6Q1AKQHscUVyvy55iWZBKCfgJJOhvDKxQqQ1HqaXWvF S/y/cYOB2MhuzyxYRe3+nI+weWvDTeZrwIXWMMrsxQsukY2VN93TSbisM+JqrWL8n1hTN9 APMFZGQndfwb7hnwmEoDvH/0N0b/EykiXMjFKOQUp5dUU15M2Z2ycLPg8ra/G6xnwL9c1a VJSqqzmnBM5piNK2A6S8BkoY2uzHuGf3EYGDcg3CsPc7clIEweMx/7oitMx3vYXkpZOxvg frwg0xI5q3Uqdys87I59wy8y4mXrcAy9mbnxNaUuEP2z/ezwbthwkViE5znnsg== 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 4PB9RK0fbCzQ2B; Tue, 7 Feb 2023 17:41:33 +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 317HfWGB018618; Tue, 7 Feb 2023 17:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317HfWxg018617; Tue, 7 Feb 2023 17:41:32 GMT (envelope-from git) Date: Tue, 7 Feb 2023 17:41:32 GMT Message-Id: <202302071741.317HfWxg018617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0a4f7dbd9e94 - stable/13 - timeout: Move from /usr/bin to /bin 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0a4f7dbd9e9450cea25af944d47dce578960a1b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=0a4f7dbd9e9450cea25af944d47dce578960a1b8 commit 0a4f7dbd9e9450cea25af944d47dce578960a1b8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-02-01 15:24:59 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-02-07 17:37:53 +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 Relnotes: yes Sponsored by: Modirum MDPay Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D38344 (cherry picked from commit e7ab133648a168c4bf7c11da840663c5581771d8) --- 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 1dac72154539..fd0c71b4814a 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 + # 20221015: update the ithread(9) man page OLD_FILES+=usr/share/man/man9/ithread.9.gz OLD_FILES+=usr/share/man/man9/ithread_add_handler.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 136877db00d6..1b2c94f42a6b 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -62,6 +62,8 @@ .. test .. + timeout + .. .. cddl lib @@ -1090,8 +1092,6 @@ .. tar .. - timeout - .. tr .. truncate diff --git a/usr.bin/Makefile b/usr.bin/Makefile index cd0e6730d568..0b32b8a7f745 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -153,7 +153,6 @@ SUBDIR= alias \ tcopy \ tee \ time \ - timeout \ tip \ top \ touch \