From nobody Tue May 23 15:13:30 2023 X-Original-To: dev-commits-src-all@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 4QQdB24rSmz4CZcn; Tue, 23 May 2023 15:13:30 +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 4QQdB24NLnz4DKC; Tue, 23 May 2023 15:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684854810; 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=qgQsttzOMsPBHGRTOpi8bBWu8BIjkrOU/hLYpvNqMVM=; b=enfmNYGDHzLk5i5Xvc5xws2lRf+kaoqXEv2igEfnkRAsWfUWUSGxBQtD1v+5FkhN8uqAg+ sc+LmYBLZ6aPTTyMjnFVh6HQ7qUvarXH+CCqCHMk1V9PRiZyyqW7UKhz1HYJxdkcUdQEB1 qbHSK1+7/dX64mcQ6xt0MfGZp23tP3ttlCxeMdI9/ye7PELhnAjLFde0TeQlSDaU7RsnZC 8aEszV7DrfyGooaqHj/sF95TBKmEBoU74T4lw5vob/f8YEsLmLaVVxBQKzt6ntqywOg/VA JrD+88YpCw5/I1KYgu9eB8x0G8oa1jkazWtTbm+OaqrJcCXn263sXzxvBBIqWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684854810; 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=qgQsttzOMsPBHGRTOpi8bBWu8BIjkrOU/hLYpvNqMVM=; b=BbyIbYUH/JHm0KPaAcZTi95m7iAcW3KkftL/mjEDrplyLd0JLHU5GPJ1uQJyMgCkqQSDpk 2mtLUm3VJ0JYpoUas/qLydMCK2cl+03EUSviR+p6sYmmbwqWo6+T7ZulEHYk4Ddfaxb2ma nsnP2aan5Z/abExiX1xWkj1NrvuHjUPB/7SHp3FM2vSYYBmuDWAeSXUV16SSEsTE4h12VR zr+eM/442iq1rSgvBqzrAeBvqMAlT89Gpa4qpXuiIvy5Ovs+6jbGofsMQ3hWZ7TwnWrald pyimz0vbPM/jujR4K2V/JcjDDASb2YriZZsXHefI90tNS1HwZe5e3RGSI+4T2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684854810; a=rsa-sha256; cv=none; b=HD7lWFET/6XEQ/IL2gNTt3KWZGapJiwuohe3+e2ZY17as5sSB7WGBLVGx6d2Z3a9QVDApo 5OfFnqRSluT0aSU9MgU7F1kpkf4YhWERLqHE2J1jr79g9OBag5ZGJ2I/g2QOvXuYvCfK6y FV/dEfXdvJ3py3tOrPGxDGcGnkFgDIIF2L0r19ADPwApznYDAfb1GC5PdO7svqsq0chRO5 ytIBc1N7Cmc8X4pkMTwtAyGHig6l3wW8yiALyH872bhNEIZ+nDWBPwaVJV7/oioYa3Y3+Q M4kGRLtGHwiiWtn4KqheIksce1ktWJTW58XYArzdfUeb+nwTY8/fZawo7p6/oA== 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 4QQdB23RkVz14WW; Tue, 23 May 2023 15:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34NFDUSq098737; Tue, 23 May 2023 15:13:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NFDUKl098736; Tue, 23 May 2023 15:13:30 GMT (envelope-from git) Date: Tue, 23 May 2023 15:13:30 GMT Message-Id: <202305231513.34NFDUKl098736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2cf8ef5910fd - main - rc.suspend: execute rc-scripts with suspend keyword List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cf8ef5910fd3754f8021f9c67fde6b9d9030f33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2cf8ef5910fd3754f8021f9c67fde6b9d9030f33 commit 2cf8ef5910fd3754f8021f9c67fde6b9d9030f33 Author: Johannes Totz AuthorDate: 2023-05-23 15:11:31 +0000 Commit: Christos Margiolis CommitDate: 2023-05-23 15:11:31 +0000 rc.suspend: execute rc-scripts with suspend keyword For symmetry with rc.resume, give rc.suspend the ability to execute rc-scripts. Use the suspend keyword for that. Use-case is for setting a wake-up time, e.g. via efiwake. Reviewed by: christos Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D39965 --- libexec/rc/rc.suspend | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.suspend b/libexec/rc/rc.suspend index 5f22cd1a05b1..41b5bcbf897b 100755 --- a/libexec/rc/rc.suspend +++ b/libexec/rc/rc.suspend @@ -43,15 +43,28 @@ fi echo $$ 2> /dev/null > /var/run/rc.suspend.pid -# If you have troubles on suspending with PC-CARD modem, try this. -# See also contrib/pccardq.c (Only for PAO users). -# pccardq | awk -F '~' '$5 == "filled" && $4 ~ /uart/ \ -# { printf("pccardc power %d 0", $1); }' | sh - # If a device driver has problems suspending, try unloading it before # suspend and reloading it on resume. Example: # kldunload usb +. /etc/rc.subr + +load_rc_config + +rcorder_opts="-k suspend" + +case ${local_startup} in +[Nn][Oo] | '') ;; +*) find_local_scripts_new ;; +esac + +files=`rcorder ${rcorder_opts} /etc/rc.d/* ${local_rc} 2>/dev/null` + +for _rc_elem in $files; do + debug "run_rc_script $_rc_elem suspend" + run_rc_script $_rc_elem suspend +done + /usr/bin/logger -t $subsystem suspend at `/bin/date +'%Y%m%d %H:%M:%S'` /bin/sync && /bin/sync && /bin/sync /bin/sleep 3