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: 0661f93892, 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
This commit is contained in:
@@ -8,6 +8,7 @@ SUBDIR= cat \
|
|||||||
chio \
|
chio \
|
||||||
chmod \
|
chmod \
|
||||||
cp \
|
cp \
|
||||||
|
cpuset \
|
||||||
date \
|
date \
|
||||||
dd \
|
dd \
|
||||||
df \
|
df \
|
||||||
|
|||||||
@@ -4,4 +4,6 @@ PROG= cpuset
|
|||||||
|
|
||||||
LIBADD= jail
|
LIBADD= jail
|
||||||
|
|
||||||
|
SYMLINKS+= ${BINDIR}/cpuset /usr/bin/cpuset
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
+2
-2
@@ -52,7 +52,7 @@ ID="/usr/bin/id"
|
|||||||
IDCMD="if [ -x $ID ]; then $ID -un; fi"
|
IDCMD="if [ -x $ID ]; then $ID -un; fi"
|
||||||
PS="/bin/ps -ww"
|
PS="/bin/ps -ww"
|
||||||
JID=0
|
JID=0
|
||||||
CPUSET="/usr/bin/cpuset"
|
CPUSET="/bin/cpuset"
|
||||||
|
|
||||||
# rc_service provides the path to the service script that we are executing.
|
# 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
|
# This is not being set here in an execution context, necessarily, so it's
|
||||||
@@ -981,7 +981,7 @@ run_rc_command()
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
_cpusetcmd=
|
_cpusetcmd=
|
||||||
if [ -n "$_cpuset" -a -x $CPUSET ]; then
|
if [ -n "$_cpuset" ]; then
|
||||||
_cpusetcmd="$CPUSET -l $_cpuset"
|
_cpusetcmd="$CPUSET -l $_cpuset"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ SUBDIR= alias \
|
|||||||
column \
|
column \
|
||||||
comm \
|
comm \
|
||||||
compress \
|
compress \
|
||||||
cpuset \
|
|
||||||
csplit \
|
csplit \
|
||||||
ctlstat \
|
ctlstat \
|
||||||
cut \
|
cut \
|
||||||
|
|||||||
Reference in New Issue
Block a user