From owner-svn-src-all@freebsd.org Wed Oct 2 16:15:35 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 969C7132CB2; Wed, 2 Oct 2019 16:15:35 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46k1T32rshz4d7d; Wed, 2 Oct 2019 16:15:35 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x92GFXpQ049379; Wed, 2 Oct 2019 09:15:33 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x92GFXKk049378; Wed, 2 Oct 2019 09:15:33 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201910021615.x92GFXKk049378@gndrsh.dnsmgr.net> Subject: Re: svn commit: r353012 - head/usr.sbin/bsdinstall/scripts In-Reply-To: <201910021609.x92G9STB044158@repo.freebsd.org> To: Glen Barber Date: Wed, 2 Oct 2019 09:15:33 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 46k1T32rshz4d7d X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 16:15:35 -0000 > Author: gjb > Date: Wed Oct 2 16:09:28 2019 > New Revision: 353012 > URL: https://svnweb.freebsd.org/changeset/base/353012 > > Log: > Add a comment explaining why the opensolaris_load line in loader.conf > is explicitly added. Thank you, Rod > > Requested by: rgrimes > MFC after: 3 days > MFC with: r353004 > Sponsored by: Rubicon Communications, LLC (Netgate) > > Modified: > head/usr.sbin/bsdinstall/scripts/config > > Modified: head/usr.sbin/bsdinstall/scripts/config > ============================================================================== > --- head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 16:08:01 2019 (r353011) > +++ head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 16:09:28 2019 (r353012) > @@ -44,6 +44,8 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc > > cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf > rm $BSDINSTALL_TMPBOOT/loader.conf.* > +# The 'opensolaris_load' line is a workaround for arm64, which does not > +# automatically load opensolaris.ko with zfs.ko. > df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "opensolaris_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf > df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf > > -- Rod Grimes rgrimes@freebsd.org