From nobody Thu Feb 17 13:46:22 2022 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 827E619D5695; Thu, 17 Feb 2022 13:46:23 +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 4Jzx1q0Cvtz3PZY; Thu, 17 Feb 2022 13:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645105583; 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=3hVgJbJ9lNc4S9WOydj6A3HrBDwNdqyeMLHzKcZXUdk=; b=CvC2smYLZnrY8EqpPwOM4RkIQqhHBDaO9RIl2iVr+pz6qBpg9A/nNrF2MiTZ3zWqLajoom VIH85HpeEeiP8a12PE0Oym1wjjzdPfosrv9J7WGG8cD2UfRlU/6ruN6DODqK8q1vEorHoN nUBKlw55vX3MfDY5d4R/GOs3N4DhYXf4/xNSoXQA2HpYgU90nI4goImsT2g4oAFO/r+y9s jci1CIPnrdfqK3l2C7sJBujSEZWMZZzjw7FsB1MnNwgTlnlr+Cs94pUj4+XOHWryhQgemT 7TC3sY0I1y9UKSfhEec3o41h6TXfo9wnEHR8YM3TLzspZcfT10QAaoNwGvpMzQ== 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 AF5692B59; Thu, 17 Feb 2022 13:46:22 +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 21HDkMpc048251; Thu, 17 Feb 2022 13:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HDkMSR048250; Thu, 17 Feb 2022 13:46:22 GMT (envelope-from git) Date: Thu, 17 Feb 2022 13:46:22 GMT Message-Id: <202202171346.21HDkMSR048250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 2ffd6857cca0 - stable/13 - rc: make the 'linux' script explicitly load filesystem modules 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ffd6857cca0a022620fb0ee6eec6dc17be5831d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645105583; 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=3hVgJbJ9lNc4S9WOydj6A3HrBDwNdqyeMLHzKcZXUdk=; b=KEb2s+TBGVlsV1/AjKYV5taXZGHElZ+C/6v/uRpJivGojXID6FEk/XgKyjgVJSy7WjdNiT J5XuIy1djutUSyvlk/zKi9QPlX0cwV755k9V6kW+JWMLUsWGZZEC52VlyijtpgnrjQVUAE S2cF/3u342jIGA+EhBItOLPMhY9EBo77Q7KPLQ+zWMKoP9mjOSt0BUsiYkmTcoRZJ+s5TF vzNRaZHtP07cecgjD/+Qi3IsCIfHxgRNum6y9hIo9C5MdDbMF6z2Hsto3VglzEWTSqsx1/ cBb7az+CF5Tb/tEBTo4EcjzjnNeGKsi+EVrV1qEpc3KaXSSnx+q7/+nIifYRqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645105583; a=rsa-sha256; cv=none; b=ra+KdZb/pM3JIGAQybH51d+NWLVMHSDaKeECxB9EpxQQRxcDtVlOsmm+hr/Qf2c9bjnOBR 77YKPebm7P2qAPgyi6bWWNne7Miv6a+N7hA/D7DhZBJK7fhwIugo1sSj8L0WXX13jKVAEi ZWIt0wJBqN2atrXhN/6Uvyz0OFLszkUISDA45ZxB0zMm9iJ5Bkj8LMs37ZsqkqY4LT6AIa geZy06VQnsDJDDejcYbnUevgnHAzemyAYIgXs2Tto/a0I46GCQVQAQ/UAAQWo7k0ruHD1d wZXO6wRDWndzZXDQjZ2AGNiCAddrKDI+5KC5yHpG1NXQPAZf8x52VZpBXMkKNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=2ffd6857cca0a022620fb0ee6eec6dc17be5831d commit 2ffd6857cca0a022620fb0ee6eec6dc17be5831d Author: Edward Tomasz Napierala AuthorDate: 2021-04-21 11:54:29 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 23:20:29 +0000 rc: make the 'linux' script explicitly load filesystem modules This removes a minor annoyance with Linux jails, where you often want linux_mounts_enable="NO", yet you want those filesystems available for mounting in jails; normally mount(8) would result in kernel automatically loading the KLD, but this doesn't work inside jails or chroots. PR: 242955 Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D29725 (cherry picked from commit 45aec46246fe61a3f45cf7da1c80850dc226f609) --- libexec/rc/rc.d/linux | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux index c9c45ba8b338..2cf32a1ecec3 100755 --- a/libexec/rc/rc.d/linux +++ b/libexec/rc/rc.d/linux @@ -46,6 +46,12 @@ linux_start() # Linux uses the pre-pts(4) tty naming scheme. load_kld pty + # Explicitly load the filesystem modules; they are usually required, + # even with linux_mounts_enable="NO". + load_kld fdescfs + load_kld linprocfs + load_kld linsysfs + # Handle unbranded ELF executables by defaulting to ELFOSABI_LINUX. if [ `sysctl -ni kern.elf64.fallback_brand` -eq "-1" ]; then sysctl kern.elf64.fallback_brand=3 > /dev/null