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.
Details
Details
- Reviewers
imp allanjude des - Group Reviewers
Klara - Commits
- rG0a4f7dbd9e94: timeout: Move from /usr/bin to /bin
rGe7ab133648a1: timeout: Move from /usr/bin to /bin
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 testDiff Detail
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Passed - Unit
No Test Coverage - Build Status
Buildable 49422 Build 46312: arc lint + arc unit
Event Timeline
Comment Actions
Hey @imp, I updated the patch because I discovered some problems during installworld. I'm sorry about that.