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 /etc | |
| 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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 4 |
1 files changed, 2 insertions, 2 deletions
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 |