From nobody Fri Aug 11 00:48:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMQC44Twfz4Tplw; Fri, 11 Aug 2023 00:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMQC43tPJz3ffg; Fri, 11 Aug 2023 00:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691714912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RWO7TAZcvIWH2OOnbf23GMBEh0ZFpfShhMUlvC4hm5M=; b=CHDBv24fxGymLYYkl8J4CRBQw9daTFUW6ABMI/xnpIwqzwYkdEcZnnuUqqwA5jXnMlGEhT HCUJ/C7etEk50uLl8CeGN+8mI42AtfVCRm5jhfgz+AU8SFT+yqAmorgZj5GZAggU74ZzSh HiItNUpccVaj22gvRcSFt+WoAtPLK/BF16mSwd1yhzc2iy8xKV2viqGmqcXrcBSbuupGJc ID1uGG45d+FIpLoUCOwBCmPKa3m53RsklgdhIKttJ8b+Xo4tNHy3DIUDqb9iUFpO7eOUIO 6g9tIYhTGBcM46WxycoFWidrh7Qojl/1eLQ9atD3SNqomVQme8gkxnt/rv7MMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691714912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RWO7TAZcvIWH2OOnbf23GMBEh0ZFpfShhMUlvC4hm5M=; b=mP1hNoBuIu7PiOrCiP21ntcEmjxWNrvGCGpGOtg8+RVCHwn3l6df3ysK9YWQ2Hkt1Qe2o2 KO1k9bvMcsNVIxBNicvjmzvYF7CQzZ/9yYNswH987usJdtX/yafAS76fYilxwfK1wv9YIF afceTlVGZLdQn7zGkwH0R2e9yzscMCeou5cJ1fT1I++OFH/qbTp0nCNCIiyiAymIxXwRyl VdeJ62ZKQ6WwTzrX60vH4fsw6vDGIGi8fjegodvxK4iPeLof5Sg2xWdmWM/pApv2RDQ0WX GwxFrFwOFK7YXLHn/I5KcVDhRjCKd5H+wO31gxTvQ9j40S1q12Jhl8o0r6BzwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691714912; a=rsa-sha256; cv=none; b=A80CqbKtMkh2CPkxEzMxwvbc5C+BxK5wXrvYzJKmgiB9bJ1YeWNDhttiioUjg+QYV+2Z90 ZwvAZXd52hIPjyvfaNjYwIzxWOmNQPcK2wCWDTb7T669crVsjQ6oIF4M1nXkEE42O2P8/0 lsgmCKaYZtm1qiBMfHjwlRJOdHPy1ddOE9XN0QPOmii1WP990fRiDA70u2FPa4tgqksPAz WA2TSR/UTikMBzVYfVNp4f1ZbllHyu7o1t3ChAm4NctMJ7VdI9J0VOQ14o7ClirZfj0H7N uv67I5g9sxfDAK/leljCsiJ2Eo0VNQkcirHCUsAx7k6b3Yr0ACYh++fbIc1VeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMQC42rjkz4D5; Fri, 11 Aug 2023 00:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B0mWAt058561; Fri, 11 Aug 2023 00:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B0mWv6058558; Fri, 11 Aug 2023 00:48:32 GMT (envelope-from git) Date: Fri, 11 Aug 2023 00:48:32 GMT Message-Id: <202308110048.37B0mWv6058558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: f05948d4e98d - main - cpuset(8): move to /bin/ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f05948d4e98d3abd0965a2994e9e42add6908ff3 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f05948d4e98d3abd0965a2994e9e42add6908ff3 commit f05948d4e98d3abd0965a2994e9e42add6908ff3 Author: Enji Cooper AuthorDate: 2023-05-11 05:54:51 +0000 Commit: Enji Cooper CommitDate: 2023-08-11 07:49:02 +0000 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 --- bin/Makefile | 1 + {usr.bin => bin}/cpuset/Makefile | 2 ++ {usr.bin => bin}/cpuset/Makefile.depend | 0 {usr.bin => bin}/cpuset/cpuset.1 | 0 {usr.bin => bin}/cpuset/cpuset.c | 0 libexec/rc/rc.subr | 4 ++-- usr.bin/Makefile | 1 - 7 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 83bf79dcb9f9..075c91394f04 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -8,6 +8,7 @@ SUBDIR= cat \ chio \ chmod \ cp \ + cpuset \ date \ dd \ df \ diff --git a/usr.bin/cpuset/Makefile b/bin/cpuset/Makefile similarity index 59% rename from usr.bin/cpuset/Makefile rename to bin/cpuset/Makefile index 74643f5e35b6..8626303bb254 100644 --- a/usr.bin/cpuset/Makefile +++ b/bin/cpuset/Makefile @@ -4,4 +4,6 @@ PROG= cpuset LIBADD= jail +SYMLINKS+= ${BINDIR}/cpuset /usr/bin/cpuset + .include diff --git a/usr.bin/cpuset/Makefile.depend b/bin/cpuset/Makefile.depend similarity index 100% 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 similarity index 100% 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 similarity index 100% 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 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 diff --git a/usr.bin/Makefile b/usr.bin/Makefile index e027eaf81f24..b4f504e0eec7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -28,7 +28,6 @@ SUBDIR= alias \ column \ comm \ compress \ - cpuset \ csplit \ ctlstat \ cut \