D40057.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40057.diff
View Options

	diff --git a/bin/Makefile b/bin/Makefile
	--- a/bin/Makefile
	+++ b/bin/Makefile
	@@ -8,6 +8,7 @@
	chio \
	chmod \
	cp \
	+ cpuset \
	date \
	dd \
	df \
	diff --git a/usr.bin/cpuset/Makefile b/bin/cpuset/Makefile
	rename from usr.bin/cpuset/Makefile
	rename to bin/cpuset/Makefile
	--- a/usr.bin/cpuset/Makefile
	+++ b/bin/cpuset/Makefile
	@@ -4,4 +4,6 @@

	LIBADD= jail

	+SYMLINKS+= ${BINDIR}/cpuset /usr/bin/cpuset
	+
	.include <bsd.prog.mk>
	diff --git a/usr.bin/cpuset/Makefile.depend b/bin/cpuset/Makefile.depend
	rename from usr.bin/cpuset/Makefile.depend
	rename to bin/cpuset/Makefile.depend
	diff --git a/usr.bin/cpuset/cpuset.1 b/bin/cpuset/cpuset.1
	rename from usr.bin/cpuset/cpuset.1
	rename to bin/cpuset/cpuset.1
	diff --git a/usr.bin/cpuset/cpuset.c b/bin/cpuset/cpuset.c
	rename from usr.bin/cpuset/cpuset.c
	rename to bin/cpuset/cpuset.c
	diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
	--- a/libexec/rc/rc.subr
	+++ b/libexec/rc/rc.subr
	@@ -52,7 +52,7 @@
	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 @@
	esac

	_cpusetcmd=
	- if [ -n "$_cpuset" -a -x $CPUSET ]; then
	+ if [ -n "$_cpuset" ]; then
	_cpusetcmd="$CPUSET -l $_cpuset"
	fi

	diff --git a/usr.bin/Makefile b/usr.bin/Makefile
	--- a/usr.bin/Makefile
	+++ b/usr.bin/Makefile
	@@ -28,7 +28,6 @@
	column \
	comm \
	compress \
	- cpuset \
	csplit \
	ctlstat \
	cut \