From nobody Sun Jan 21 18:11:11 2024 X-Original-To: dev-commits-src-branches@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 4TJ1cv4brMz57RKH; Sun, 21 Jan 2024 18:11:11 +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 4TJ1cv4B43z4Q2p; Sun, 21 Jan 2024 18:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705860671; 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=RTzO0PUQyEvAznlZMrVkPYxErXXXQ88Zkfion2EbTu8=; b=OsPBFENBMjHl9OJxwi/HzlSQYpQ/X/tq+A3FHg6R9sB+VutHwRna880yH6NXG4vBuS5ep6 Nao/wax6cSumt8XGsIVq57osn3weAyR8kVKC5CT8TXO/QlOqfgsM/36Frtedr2umwNlu+a xprzIt8JTKolghCWc+6Fn/FG99Nstvk+rfiY3pt43QvWJK646mbdpgbbtzMwxkL26oeZro honNXdmpWnmKdkB3RLXw3zWKzukpeunAMjeVp1oprwaOzWfJtROp1xG7489T7e731xlajX 5cG6KV2ZCQUHgjhLo9myVQXeeF0LF6NZaVMgsWXM9S59pTGcVchtKjyD8Ja5LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705860671; 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=RTzO0PUQyEvAznlZMrVkPYxErXXXQ88Zkfion2EbTu8=; b=Y72FooupiJCOWzbdGPiay7ACyC+KJW9C0TR5mh2oG5b7oUPun64Hd2zN/QmB6HRpPjzgGg rVi+VL67gctU25bFd5KZGWOIgpboXNMRtcgVqtAyApOYs1U/S4T87hBcEI9MamhWdXWdfX wz8RHQnYl2k1bT4jLM6YjbJVT14xycAJ9XYXy65e8Ux3c736i5oQNtI1s+xJhdabpa9ivP Dm9/8EV3WUrUvdmGxPIXQZE0o2wcC7cQ2A6e8n1hGl8hggUlwQyw9U2TZw8OyDuSCexpvI UUfH4A95Zt5Y5TE/F8mhmFHO2jYtVZs+htCI6oDwWT2JV1Qx/Kqe3TZYMU+7RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705860671; a=rsa-sha256; cv=none; b=HHXgEFeoeMmC8GWIMINbO6YD7A2Tl46sFLFGAWX434Z4L3K8/ct5DUXGhsIKoiF1SUBs+/ 5gr5z6qaaFILFC7/LYcIcSKIMYayp4UkoZ9MFpDhfPRfogJmBjLTz4edQuH6eiZ3zibZPr KTqnlbFq0EabtJMtHG0WR7qJSS3cytiAnFmNudoZR9R817ic3Ud+uzQkOjaw5diIH2j5AR iZbBeYru3ypEZcTN1SoIH3/NF74CVP77u9+Bn3zo05VulAE1V6ythJcV9PFBaTy4xocblN 6QULPreGOemtzE2/BrwscWop5guvcJjd136KbgfO3W41F7VIqSJGtiSHZIwrzw== 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 4TJ1cv3J65zSj4; Sun, 21 Jan 2024 18:11:11 +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 40LIBBuF052043; Sun, 21 Jan 2024 18:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LIBBGW052040; Sun, 21 Jan 2024 18:11:11 GMT (envelope-from git) Date: Sun, 21 Jan 2024 18:11:11 GMT Message-Id: <202401211811.40LIBBGW052040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f5c2e34f226 - stable/13 - renice: Force /bin/sh usage on su calls for the regression tests. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f5c2e34f226a7ffd04a71dfb5e9c7f358068607 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f5c2e34f226a7ffd04a71dfb5e9c7f358068607 commit 9f5c2e34f226a7ffd04a71dfb5e9c7f358068607 Author: Olivier Cochard AuthorDate: 2022-10-13 15:23:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-01-21 16:11:08 +0000 renice: Force /bin/sh usage on su calls for the regression tests. If the root account is configured to use a different shell than sh, it fails to retreive the pid of the background process. Approved by: des Obtained from: chs Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36930 (cherry picked from commit 07b1ea961af77d728dfef4d0a11f98a8ab2fe226) --- usr.bin/renice/tests/renice_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/renice/tests/renice_test.sh b/usr.bin/renice/tests/renice_test.sh index feb07a6af825..8a4df7879ad4 100755 --- a/usr.bin/renice/tests/renice_test.sh +++ b/usr.bin/renice/tests/renice_test.sh @@ -90,7 +90,7 @@ renice_abs_user_head() { } renice_abs_user_body() { local user pid nice incr - pid=$(su -m $TEST_USER -c "sleep 60 >/dev/null & echo \$!") + pid=$(su -m $TEST_USER -c "/bin/sh -c 'sleep 60 >/dev/null & echo \$!'") nice="$(ps -o nice= -p $pid)" incr=3 _renice $((nice+incr)) -u $TEST_USER @@ -105,7 +105,7 @@ renice_rel_user_head() { } renice_rel_user_body() { local user pid nice incr - pid=$(su -m $TEST_USER -c "sleep 60 >/dev/null & echo \$!") + pid=$(su -m $TEST_USER -c "/bin/sh -c 'sleep 60 >/dev/null & echo \$!'") nice="$(ps -o nice= -p $pid)" incr=3 _renice -u -n $incr $TEST_USER