aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2023-05-11 05:54:51 +0000
committerEnji Cooper <ngie@FreeBSD.org>2023-08-11 07:49:02 +0000
commitf05948d4e98d3abd0965a2994e9e42add6908ff3 (patch)
tree9e1cd6e92f5ca9ff1225f8e78c43b05edcb9427c /libexec
parentfb055b01eb04914ea1aadc7c88090093a8481fe7 (diff)
cpuset(8): move to /bin/
Summary: This change moves /usr/bin/cpuset to /bin/cpuset so it is more readily available on hosts where the /usr partition might not be mounted at the time / has been mounted. Remove some complexity from rc.subr(8) since /bin is assumed to always be present if/when / is mounted. MFC after: 2 weeks MFC with: 0661f93892a2, 271d552379af Test Plan: - Test out rc.subr change. - Confirm that the installation logic does what's needed. Relnotes: yes (moving cpuset may impact strict file permissions/mode checking) Reviewers: kevans Subscribers: imp Differential Revision: https://reviews.freebsd.org/D40057
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rc/rc.subr4
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index 0114dd5ca5a8..bd6c6c6b7679 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -52,7 +52,7 @@ ID="/usr/bin/id"
IDCMD="if [ -x $ID ]; then $ID -un; fi"
PS="/bin/ps -ww"
JID=0
-CPUSET="/usr/bin/cpuset"
+CPUSET="/bin/cpuset"
# rc_service provides the path to the service script that we are executing.
# This is not being set here in an execution context, necessarily, so it's
@@ -981,7 +981,7 @@ run_rc_command()
esac
_cpusetcmd=
- if [ -n "$_cpuset" -a -x $CPUSET ]; then
+ if [ -n "$_cpuset" ]; then
_cpusetcmd="$CPUSET -l $_cpuset"
fi