From owner-svn-src-all@freebsd.org Sun Feb 7 00:55:41 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C400A9F4B5 for ; Sun, 7 Feb 2016 00:55:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qg0-x236.google.com (mail-qg0-x236.google.com [IPv6:2607:f8b0:400d:c04::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DC4151470 for ; Sun, 7 Feb 2016 00:55:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qg0-x236.google.com with SMTP id b35so95109047qge.0 for ; Sat, 06 Feb 2016 16:55:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=c3iIhC1Z7cAj32e5QaSK+IxNKm+jxanwhVimXDYgn7o=; b=wbwVwukTymj6ByoDmY/uoVh4A63IxlE9SYxG2U2l06HvdVCfDW5ASHi+skzjjZcDzx EdrJH+oM27+lrVJv8/G7OtAEnQdXGytiNUwdtpettxaZb0wqAFnqbPnlM1b84qP1fwke 47HcZzxxwfdMRwhJjz5Nyrw8t7hp6rxFhFapGwFuM7qtWW0L10ipZPfUzzl55mEcxlXt yjPdj0CFQObcgbKpJco94GekrHQW1n/jHfhqolzIBSZ4baCwLfnCUtWOOiEHfYgXzHDW 0WTDgTV4K0CBEaVbpAMKCFr/FKupGzMn4YfZJYYmmt0/zyAF254k0YZodEJm+GfG0eq1 qFAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=c3iIhC1Z7cAj32e5QaSK+IxNKm+jxanwhVimXDYgn7o=; b=ELBXzCM8w28BFIRdzJNfURs5BBS8IxfufGyrNjzxCpWuhr+tBB7iH8C9Ys32zngQ/P 45LI7+RTvRwSWruqeVbP16ZvtKxR1MNSGot90IW6+Hhm0IfgLx7yquuHfZMHhNRlj77F P0gfKx8udTzHK/oBTVCoLsBPFKDxcfiC35OzhwaPwAoWGYQ4cUJ8Elmhnxj3oc8HYRcy NqIpM+Awu34ERxOysUxEd5LL1vor9R7Zn3oTeqQEKdevZasNnWB5lAfzDS+UnJ7H3gi2 8wbaTOBb6OmSDWvceqBM8c5SomLrzsBMXzflClolpN8y8cds9JEcAs2lJLNWrS0A9wyD 2/Ww== X-Gm-Message-State: AG10YOQ5nrBdT6pGMongrKMGOImzM9KgDtVO7TkNpXJVRWgcCoiBpDprnwnv6lDpb/iZU/t6ldZIi+DKbEI4vA== MIME-Version: 1.0 X-Received: by 10.140.28.162 with SMTP id 31mr18470919qgz.81.1454806539848; Sat, 06 Feb 2016 16:55:39 -0800 (PST) Sender: wlosh@bsdimp.com Received: by 10.140.30.166 with HTTP; Sat, 6 Feb 2016 16:55:39 -0800 (PST) X-Originating-IP: [50.253.99.174] In-Reply-To: <201602070049.u170nFBo047492@repo.freebsd.org> References: <201602070049.u170nFBo047492@repo.freebsd.org> Date: Sat, 6 Feb 2016 17:55:39 -0700 X-Google-Sender-Auth: OyNVB6ZqhSarTMNXNok1kiKFXac Message-ID: Subject: Re: svn commit: r295357 - head/sys/boot/zfs From: Warner Losh To: Allan Jude Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 07 Feb 2016 00:55:41 -0000 On Sat, Feb 6, 2016 at 5:49 PM, Allan Jude wrote: > Author: allanjude > Date: Sun Feb 7 00:49:15 2016 > New Revision: 295357 > URL: https://svnweb.freebsd.org/changeset/base/295357 > > Log: > Do not set vfs.root.mountfrom unnecessarily > > This causes boot from external media (installer USB image) to mount / > from > the default ZFS BE, rather than the USB device. > Sure this didn't just break zfs booting? Warner > Reported by: kmoore > MFC after: 5 days > Sponsored by: ScaleEngine Inc. > > Modified: > head/sys/boot/zfs/zfs.c > > Modified: head/sys/boot/zfs/zfs.c > > ============================================================================== > --- head/sys/boot/zfs/zfs.c Sat Feb 6 22:01:25 2016 (r295356) > +++ head/sys/boot/zfs/zfs.c Sun Feb 7 00:49:15 2016 (r295357) > @@ -722,8 +722,6 @@ init_zfs_bootenv(char *currdev) > currdev[strlen(currdev) - 1] = '\0'; > setenv("zfs_be_active", currdev, 1); > setenv("zfs_be_currpage", "1", 1); > - /* Do not overwrite if already set */ > - setenv("vfs.root.mountfrom", currdev, 0); > /* Forward past zfs: */ > currdev = strchr(currdev, ':'); > currdev++; > >