From owner-svn-src-head@freebsd.org Tue Apr 9 13:14:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B49971580D2E; Tue, 9 Apr 2019 13:14:12 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8836D8CE6B; Tue, 9 Apr 2019 13:14:11 +0000 (UTC) (envelope-from ohartmann@walstatt.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1554815641; bh=jNeMGRpvcIraIT/VzE+EREQ/B7UHExJSDwQKlCRiZ/4=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=VafBi4PyRZf7TfoLRlVMYdrmA1lO+oJ1qxXsp7m7f3hobJljV5bXYQWbmvyeTwp03 KH18i8xz5OdSDhhOmTOtUu+qFW2GSNRKik4y4lh4Cj3vdI097XPJZZuHujMs2qCjQ6 BBrlFjtch1m2bn5bVD72YOlNdRW3wz0OPn1b54bM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from freyja ([46.88.91.252]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lm6IP-1gems42tyj-00Zd1M; Tue, 09 Apr 2019 15:14:01 +0200 Date: Tue, 9 Apr 2019 15:13:54 +0200 From: "O. Hartmann" To: Chris Rees Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 Message-ID: <20190409151340.6f33b077@freyja> In-Reply-To: <201904071831.x37IVj4r096803@repo.freebsd.org> References: <201904071831.x37IVj4r096803@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:qf+0c8Mnsv0OMc6eMNHMwTOov35lvDyRKxfSwGrrHxT8xrzZuRQ esrwYUu766ASSbSaQRCDCeJXBFdgwkXMLI6F/ckuCxj34qw/AyzNstLTL3BHCfLhFGs0aLY 9eZ9rjTJAh85zK63YDyv3w1moVk6WSOG0a4sGgQfega6YLtc/GvIkcvLhlAUfYW92eJXu93 Zn7+goKOKOPxDkV3eswlg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:GbimZ4IjO1w=:+8c1MwlmDUIOkAoOnFt53u Hv2aRo6jkgxPUPvv6h3zY9eAVn9T4z76pFhnc8nfMZBId933jyR25vrpx7WJk749FdXNQWFhn 3D//LUVftfFfmEOOuCGF14zcyB7mPysY5HHpiiTzvwKRWsRj5FmudYCzDJDpF2wu9TUWX/tMX 2lZQ54/Uo2r7gRpunuzioJxZouNxMiHE91uD+2ep88tkRR4aR7ldynfGLX6UerEYRjYBhfvG1 gctBE2iLWKKW3uwA3F/QFKpbPpatGtnhjol+GTEjU5FTj7hZPev1+jOYw7JfTdcinSAiExIwB R53MvvPucCMonQPboROttUQzp6GwkFJQb80vZAqYynEkAHcxUWteuvotcPLeW5bOC+npPVP56 5+kZYU2wfIErDFZUDKTFwGN6CTCm7b6xIymbX9xobxW9mIcBS1VxYmgD7tvaMOubSYs2Aj9sS 0dd4W5hkc8X+IUW88gAxd/vmrPOevgLo391EqRU7jwABZ4hizp7Kt94jcetSotS+Eiub1YVFr OgIGMZuL0DPox03jbPIEwx3uC+KnUVSm1G9bu2VXoFaWVT5YVG3wplNx/K19y2Cc8O1oDMkOo xCKppOyNm6oLH9cHuNENTS3MEwOaa+QzyYnkZUsEJ9z9wGlwpyngyzhq1/SM7RGA+E/Atk/nQ P71xYxY34VfrMntVoyt8GobGC631Y6VYng8cJ9fdV4lNEZmNxxdjzgzI8y7hx6hiRp1vrCK2z TLx7Z7QgoOQzOblxEfFSWokG2nBd7r9jwD6fPYmbSepvemhFMmUsnuE+UHG0/23p9dbDJT2jM 6i19iH86x3m+d/OhxVPkTAbaM6Sr9OIKB8si/jCnAXNt7/2DP+ZipdDGWc4Btfs+e4UPeHZaI 1nWOWgBeTPkRPtFKFeGzU2DH7TcFx6Wht5hIPRzkQgMIGI8r9CUn8G9zI21dhzovd3pdIYwo1 kvdJzwhHQkw== X-Rspamd-Queue-Id: 8836D8CE6B X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=VafBi4Py X-Spamd-Result: default: False [-3.74 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; NEURAL_HAM_MEDIUM(-0.97)[-0.968,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[walstatt.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; IP_SCORE(-1.13)[ip: (-5.79), ipnet: 212.227.0.0/16(-1.38), asn: 8560(1.54), country: DE(-0.01)]; DKIM_TRACE(0.00)[gmx.net:+]; MX_GOOD(-0.01)[cached: mx00.gmx.net]; NEURAL_HAM_SHORT(-0.73)[-0.732,0]; R_SPF_NA(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[21.17.227.212.list.dnswl.org : 127.0.3.1]; RECEIVED_SPAMHAUS_PBL(0.00)[252.91.88.46.zen.spamhaus.org : 127.0.0.10]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 13:14:13 -0000 On Sun, 7 Apr 2019 18:31:45 +0000 (UTC) Chris Rees wrote: > Author: crees (doc,ports committer) > Date: Sun Apr 7 18:31:45 2019 > New Revision: 346017 > URL: https://svnweb.freebsd.org/changeset/base/346017 > > Log: > Remove now unnecessary kldstat check before attempting to load modules= . > > Since r233109, kldload has the -n option, which silently ignores optio= ns > that are already loaded. > > https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.ht= ml > > Note that this script no longer reports if the module is already loade= d, > but it could be argued this wasn't particularly useful information. > > PR: docs/234248 > Reviewed by: bcr (docs), kib, rgrimes (visual) > Approved by: jilles > Differential Revision: https://reviews.freebsd.org/D18670 > > Modified: > head/libexec/rc/rc.d/abi > head/libexec/rc/rc.d/bthidd > head/libexec/rc/rc.d/cfumass > head/libexec/rc/rc.d/kld > head/libexec/rc/rc.d/mdconfig > head/libexec/rc/rc.d/mdconfig2 > head/libexec/rc/rc.d/mountcritremote > head/libexec/rc/rc.d/syscons > head/libexec/rc/rc.subr > head/share/man/man5/rc.conf.5 > > Modified: head/libexec/rc/rc.d/abi > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/abi Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/abi Sun Apr 7 18:31:45 2019 (r346017) > @@ -27,10 +27,10 @@ linux_start() > local _tmpdir > > echo -n ' linux' > - load_kld -e 'linux(aout|elf)' linux > + load_kld linux > case `sysctl -n hw.machine_arch` in > amd64) > - load_kld -e 'linux64elf' linux64 > + load_kld linux64 > ;; > esac > if [ -x /compat/linux/sbin/ldconfigDisabled ]; then > > Modified: head/libexec/rc/rc.d/bthidd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/bthidd Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/bthidd Sun Apr 7 18:31:45 > 2019 (r346017) @@ -34,11 +34,11 @@ evdev_enabled() > bthidd_prestart() > { > if evdev_enabled; then > - load_kld -m uinput uinput > + load_kld uinput > fi > - load_kld -m kbdmux kbdmux > - load_kld -m vkbd vkbd > - load_kld -m ng_btsocket ng_btsocket > + load_kld kbdmux > + load_kld vkbd > + load_kld ng_btsocket > return 0 > } > > > Modified: head/libexec/rc/rc.d/cfumass > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/cfumass Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/cfumass Sun Apr 7 18:31:45 > 2019 (r346017) @@ -75,7 +75,7 @@ cfumass_start() > return "${err}" > fi > > - load_kld -e cfumass cfumass > + load_kld cfumass > > # If the template is already switched to Mass Storage, then reset > # it to -1 to force the host to reenumerate it; otherwise it might > > Modified: head/libexec/rc/rc.d/kld > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/kld Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/kld Sun Apr 7 18:31:45 2019 (r346017) > @@ -46,7 +46,7 @@ kld_start() > > echo 'Loading kernel modules:' > for _kld in $kld_list ; do > - load_kld -e ${_kld}.ko $_kld > + load_kld $_kld > done > } > > > Modified: head/libexec/rc/rc.d/mdconfig > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:31:45 > 2019 (r346017) @@ -114,7 +114,7 @@ mdconfig_start() > continue > fi > if [ "${_file}" !=3D "${_file%.uzip}" ]; then > - load_kld -m g_uzip geom_uzip || > return 3 > + load_kld geom_uzip || return 3 > # sleep a bit to allow creation > of /dev/mdX.uzip sleep 2 > fi > > Modified: head/libexec/rc/rc.d/mdconfig2 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:31:45 > 2019 (r346017) @@ -123,7 +123,7 @@ mdconfig2_start() > # been created. > if [ "${_type}" =3D "vnode" -a "${_fs}" !=3D "/" ]; then > if [ "${_file}" !=3D "${_file%.uzip}" ]; then > - load_kld -m g_uzip geom_uzip || return 3 > + load_kld geom_uzip || return 3 > fi > if is_readonly ${_fs}; then > warn "${_fs} is mounted read-only, skipping > ${_md}." > > Modified: head/libexec/rc/rc.d/mountcritremote > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/mountcritremote Sun Apr 7 18:24:26 > 2019 (r346016) +++ head/libexec/rc/rc.d/mountcritremote Sun > Apr 7 18:31:45 2019 (r346017) @@ -27,7 +27,7 @@ > mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in > *mount_nfs*) > # Handle absent nfs client support > - load_kld -m nfs nfscl || return 1 > + load_kld nfscl || return 1 > ;; > esac > return 0 > > Modified: head/libexec/rc/rc.d/syscons > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.d/syscons Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/syscons Sun Apr 7 18:31:45 > 2019 (r346017) @@ -346,7 +346,7 @@ syscons_start() > for i in `kldstat | awk '$5 ~ "_saver\.ko$" { print $5 }'`; > do kldunload ${i} > done > - load_kld -e _saver ${saver}_saver > + load_kld ${saver}_saver > ;; > esac > > > Modified: head/libexec/rc/rc.subr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/libexec/rc/rc.subr Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.subr Sun Apr 7 18:31:45 2019 (r346017) > @@ -1853,48 +1853,29 @@ mount_md() > } > > # Code common to scripts that need to load a kernel module > -# if it isn't in the kernel yet. Syntax: > -# load_kld [-e regex] [-m module] file > -# where -e or -m chooses the way to check if the module > -# is already loaded: > -# regex is egrep'd in the output from `kldstat -v', > -# module is passed to `kldstat -m'. > -# The default way is as though `-m file' were specified. > +# if it isn't in the kernel yet. Syntax: > +# load_kld file > load_kld() > { > - local _loaded _mod _opt _re > + local _opt > > + # Silently ignore legacy options; they are unnecessary > while getopts "e:m:" _opt; do > case "$_opt" in > - e) _re=3D"$OPTARG" ;; > - m) _mod=3D"$OPTARG" ;; > - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; > + e) ;; > + m) ;; > + *) err 3 'USAGE: load_kld file' ;; > esac > done > shift $(($OPTIND - 1)) > if [ $# -ne 1 ]; then > - err 3 'USAGE: load_kld [-e regex] [-m module] file' > + err 3 'USAGE: load_kld file' > fi > - _mod=3D${_mod:-$1} > - _loaded=3Dfalse > - if [ -n "$_re" ]; then > - if kldstat -v | egrep -q -e "$_re"; then > - _loaded=3Dtrue > - fi > + if ! kldload -n "$1"; then > + warn "Unable to load kernel module $1" > + return 1 > else > - if kldstat -q -m "$_mod"; then > - _loaded=3Dtrue > - fi > - fi > - if ! $_loaded; then > - if ! kldload "$1"; then > - warn "Unable to load kernel module $1" > - return 1 > - else > - info "$1 kernel module loaded." > - fi > - else > - debug "load_kld: $1 kernel module already loaded." > + info "$1 kernel module loaded." > fi > return 0 > } > > Modified: head/share/man/man5/rc.conf.5 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > --- head/share/man/man5/rc.conf.5 Sun Apr 7 18:24:26 2019 > (r346016) +++ head/share/man/man5/rc.conf.5 Sun Apr 7 18:31:45 > 2019 (r346017) @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd March 21, 2019 > +.Dd April 7, 2019 > .Dt RC.CONF 5 > .Os > .Sh NAME > @@ -249,9 +249,7 @@ Default > .It Va kld_list > .Pq Vt str > A whitespace-separated list of kernel modules to load right after > -the local disks are mounted, without any > -.Pa .ko > -extension or path. > +the local disks are mounted, with optional path. > Loading modules at this point in the boot process is > much faster than doing it via > .Pa /boot/loader.conf > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" It seems this patch breaks ZFS if ZFS is built-in kernel! Having ZFS as kernel built-in leaves the system not mounting ANY(!) ZFS vo= lume at boot time, rendering servers unusable. Mounting ZFS filesystems with "zfs mount -a" bring back the ZFS filesystem= s as expected. Regards, oh