diff options
author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2023-02-01 15:24:59 +0000 |
---|---|---|
committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2023-02-02 17:34:35 +0000 |
commit | e7ab133648a168c4bf7c11da840663c5581771d8 (patch) | |
tree | 0110d5cfb8bbe1cc60a3493361b90eac7deff1b9 | |
parent | 0f031350f32b8760e0843a6476d67aa21116103b (diff) | |
download | src-e7ab133648a168c4bf7c11da840663c5581771d8.tar.gz src-e7ab133648a168c4bf7c11da840663c5581771d8.zip |
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 <r4@sovserv.ru>
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
-rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
-rw-r--r-- | bin/Makefile | 1 | ||||
-rw-r--r-- | bin/timeout/Makefile (renamed from usr.bin/timeout/Makefile) | 2 | ||||
-rw-r--r-- | bin/timeout/Makefile.depend (renamed from usr.bin/timeout/Makefile.depend) | 0 | ||||
-rw-r--r-- | bin/timeout/tests/Makefile (renamed from usr.bin/timeout/tests/Makefile) | 0 | ||||
-rw-r--r-- | bin/timeout/tests/Makefile.depend (renamed from usr.bin/timeout/tests/Makefile.depend) | 0 | ||||
-rw-r--r-- | bin/timeout/tests/timeout_test.sh (renamed from usr.bin/timeout/tests/timeout_test.sh) | 0 | ||||
-rw-r--r-- | bin/timeout/timeout.1 (renamed from usr.bin/timeout/timeout.1) | 0 | ||||
-rw-r--r-- | bin/timeout/timeout.c (renamed from usr.bin/timeout/timeout.c) | 0 | ||||
-rw-r--r-- | etc/mtree/BSD.tests.dist | 4 | ||||
-rw-r--r-- | 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 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 index 6cfaab1c3644..6cfaab1c3644 100644 --- a/usr.bin/timeout/Makefile.depend +++ b/bin/timeout/Makefile.depend diff --git a/usr.bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile index 691a27df20b1..691a27df20b1 100644 --- a/usr.bin/timeout/tests/Makefile +++ b/bin/timeout/tests/Makefile diff --git a/usr.bin/timeout/tests/Makefile.depend b/bin/timeout/tests/Makefile.depend index f80275d86ab1..f80275d86ab1 100644 --- a/usr.bin/timeout/tests/Makefile.depend +++ b/bin/timeout/tests/Makefile.depend diff --git a/usr.bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh index ffddfcafb4bb..ffddfcafb4bb 100644 --- a/usr.bin/timeout/tests/timeout_test.sh +++ b/bin/timeout/tests/timeout_test.sh diff --git a/usr.bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 27f022c48636..27f022c48636 100644 --- a/usr.bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 diff --git a/usr.bin/timeout/timeout.c b/bin/timeout/timeout.c index d6b82373c0a1..d6b82373c0a1 100644 --- a/usr.bin/timeout/timeout.c +++ b/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 \ |