Differential D38344

timeout: Move from /usr/bin to /bin
ClosedPublic
Actions

Authored by 0mp on Feb 1 2023, 6:26 PM.

Tags

None

Referenced Files

	F118832447: D38344.diff
	Mon, Jun 2, 9:47 AM

	Unknown Object (File)
	Fri, May 23, 2:11 PM

	Unknown Object (File)
	Sat, May 10, 6:50 AM

	Unknown Object (File)
	Apr 30 2025, 9:55 PM

	Unknown Object (File)
	Apr 24 2025, 1:50 AM

	Unknown Object (File)
	Apr 22 2025, 11:47 AM

	Unknown Object (File)
	Apr 17 2025, 7:25 AM

	Unknown Object (File)
	Apr 14 2025, 5:57 AM

Subscribers

Details

Reviewers

imp
allanjude
des

Group Reviewers

Commits

rG0a4f7dbd9e94: timeout: Move from /usr/bin to /bin
rGe7ab133648a1: timeout: Move from /usr/bin to /bin

Summary

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
Reported by:	Ivan <r4@sovserv.ru>
MFC after:	1 week
Sponsored by:	Modirum MDPay
Sponsored by:	Klara Inc.

Test Plan

buildworld, installworld

# time timeout 1s sleep 5
        1.05 real         0.00 user         0.00 sys
# which timeout
/bin/timeout
# which -a timeout
/bin/timeout
/usr/bin/timeout
# cd /usr/tests/bin/timeout && kyua test

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

0mp created this revision.Feb 1 2023, 6:26 PM

Herald added a subscriber: imp. · View Herald TranscriptFeb 1 2023, 6:26 PM

0mp requested review of this revision.Feb 1 2023, 6:26 PM

Harbormaster completed remote builds in B49422: Diff 116218.Feb 1 2023, 6:26 PM

0mp added a reviewer: Klara.Feb 1 2023, 6:27 PM

imp accepted this revision.Feb 1 2023, 8:52 PM

This revision is now accepted and ready to land.Feb 1 2023, 8:52 PM

0mp edited the test plan for this revision. (Show Details)Feb 1 2023, 9:57 PM

Fix mtree

This revision now requires review to proceed.Feb 1 2023, 9:58 PM

Harbormaster completed remote builds in B49433: Diff 116234.Feb 1 2023, 9:58 PM

Mark old test paths as obsolete.

Harbormaster completed remote builds in B49434: Diff 116235.Feb 1 2023, 10:02 PM

Hey @imp, I updated the patch because I discovered some problems during installworld. I'm sorry about that.

0mp mentioned this in D36906: Tolerate missing /usr/bin/timeout in zfskeys.Feb 2 2023, 4:50 PM

Reviewed by: allanjude

This revision is now accepted and ready to land.Feb 2 2023, 5:10 PM

I think this looks good.

des accepted this revision.Feb 2 2023, 5:15 PM

Thanks everyone! :)

Closed by commit rGe7ab133648a1: timeout: Move from /usr/bin to /bin (authored by 0mp). · Explain WhyFeb 2 2023, 5:36 PM

This revision was automatically updated to reflect the committed changes.

0mp added a commit: rGe7ab133648a1: timeout: Move from /usr/bin to /bin.

0mp added a commit: rG0a4f7dbd9e94: timeout: Move from /usr/bin to /bin.Feb 7 2023, 5:42 PM

Revision Contents
Changeset List

Path

Size

ObsoleteFiles.inc

4 lines

bin/

1 line

	bin/	timeout/
	usr.bin/	timeout/

2 lines

Makefile.depend

tests/

Makefile.depend

timeout_test.sh

etc/

mtree/

4 lines

usr.bin/

1 line

timeout/

Makefile.depend

tests/

Makefile.depend

timeout_test.sh

Diff 116347

ObsoleteFiles.inc

Loading...

bin/Makefile

Loading...

bin/timeout/Makefile

Loading...

bin/timeout/Makefile.depend

Loading...

bin/timeout/tests/Makefile

Loading...

bin/timeout/tests/Makefile.depend

Loading...

bin/timeout/tests/timeout_test.sh

Loading...

bin/timeout/timeout.1

Loading...

bin/timeout/timeout.c

Loading...

etc/mtree/BSD.tests.dist

Loading...

usr.bin/Makefile

Loading...

usr.bin/timeout/Makefile

Loading...

usr.bin/timeout/Makefile.depend

Loading...

usr.bin/timeout/tests/Makefile

Loading...

usr.bin/timeout/tests/Makefile.depend

Loading...

usr.bin/timeout/tests/timeout_test.sh

Loading...

usr.bin/timeout/timeout.1

Loading...

usr.bin/timeout/timeout.c

Loading...