From nobody Thu Feb 10 19:44:01 2022 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 7B70D19A96C8; Thu, 10 Feb 2022 19:44:02 +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 4JvnHj6rRCz3H18; Thu, 10 Feb 2022 19:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644522242; 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=U3IG3DII783VKtRkEYhfw3RZWTsBKmE2h3vKUL80fgo=; b=ueRnXzhYwMv06G3BMDY8mG3y0Enz2f5zCsjV0k1pQICrHYlUIz/GwviM3OXZsSNIhhGIfV 9EEJKNP62dMKme4TO/c2k8LDJx9L5n5aFJr91AuBzoFgn+dS2KF/ARUIkd33E8QVT2R5Lb Mjx4hLeu7MHrPxBO66EA50YtT73wFLoyhd/gRYzQ/6njJ0FfkkC2qqMdGXz2R40FKwMkAT O2cD8N0qK3429qO6Z6qMM/IOKNgqsdnrFevycHrE0P/caxEP+D+570EfeVwmnCt9wRjyQf bHJJwlByi0vkzsBoVgTeqe0UGi4ZMYRMBmgxzAYVvYjxwCdm6En4WFdpAXtMDA== 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 8C5D4264B7; Thu, 10 Feb 2022 19:44:01 +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 21AJi1Do035581; Thu, 10 Feb 2022 19:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AJi1Ta035580; Thu, 10 Feb 2022 19:44:01 GMT (envelope-from git) Date: Thu, 10 Feb 2022 19:44:01 GMT Message-Id: <202202101944.21AJi1Ta035580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c96f70e7ac54 - main - rc: Remove extra whitespace 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c96f70e7ac54ca9347d81672edb9538313b57fd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644522242; 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=U3IG3DII783VKtRkEYhfw3RZWTsBKmE2h3vKUL80fgo=; b=ENF41dtuviZjcIOCHQxxf8i3TQ8BT8dCnhG1JQUsyg1g5THxMnTNocPouc5UsUCX9rWSTn POEc2mf0JJD7miB6wQdhnYvDLxWFmgligTdvUUszVI+3eiF6/g+gzIvz9oQlzeQWfJUQkV EQsGKB2H0vxOrdp8sjM/pri5jzxk7Gc1JeiF9tIYYxoIAW+2/W3FqRm9ni+e4XuQzwGFWR eHzTLla3LHHI/r5lmacnf6vY0MxzjEgIHaDUVt6UgCrIjlHffXLjyXl/6fnB43p+E3FCSA M0yO2HZZvIGDsuNyNnNE6WhknH/zbhsvkiMpKWAhy0FqnlXrUu48Qu9wX46PGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644522242; a=rsa-sha256; cv=none; b=d+b5HEO3DgcO17bVyLZ0kf4qLlepRTSxTqZsoTUER4pVQHxkbPbrDLU6OTVmFb66+bHOUi nQuzZb198ph0mIwxOlawgsMKPzhdKCh5yiMCJMruVlvZy2D6oMq7otdDGGuaP1C0iZ8Mat R/My1/3n9OB3L9BMS1PsLc0F00hPXRNyrj/0DqwNVqO+alVW10oepl+py2EZpVttSdzdM6 1J2RoaJDd3ZqzXTCilg+BxdUmQSlHpoXBIMEVdijZb2IMlP0uIEiL+A7YaSK4RdUfqC0ge 0STPdIZJoG1xgi+oGj9X0FGp0FAQ+Hb1iQ7axkTeiEFF8rM55S4bhfHLJBut8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c96f70e7ac54ca9347d81672edb9538313b57fd1 commit c96f70e7ac54ca9347d81672edb9538313b57fd1 Author: Jose Luis Duran AuthorDate: 2022-02-10 19:42:33 +0000 Commit: Warner Losh CommitDate: 2022-02-10 19:43:19 +0000 rc: Remove extra whitespace Differential Revision: https://reviews.freebsd.org/D34165 --- libexec/rc/rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc b/libexec/rc/rc index 35db4a850516..f117125d2d82 100644 --- a/libexec/rc/rc +++ b/libexec/rc/rc @@ -137,16 +137,16 @@ done # Note: this assumes firstboot_sentinel is on / when we have # a read-only /, or that it is on media that's writable. if [ -e ${firstboot_sentinel} ]; then - checkyesno root_rw_mount && mount -uw / + checkyesno root_rw_mount && mount -uw / chflags -R 0 ${firstboot_sentinel} rm -rf ${firstboot_sentinel} if [ -e ${firstboot_sentinel}-reboot ]; then chflags -R 0 ${firstboot_sentinel}-reboot rm -rf ${firstboot_sentinel}-reboot - checkyesno root_rw_mount || mount -ur / + checkyesno root_rw_mount || mount -ur / kill -INT 1 fi - checkyesno root_rw_mount || mount -ur / + checkyesno root_rw_mount || mount -ur / fi echo ''