From owner-svn-src-head@freebsd.org Thu Jan 7 19:33:23 2016 Return-Path: Delivered-To: svn-src-head@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 2097AA66777 for ; Thu, 7 Jan 2016 19:33:23 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) (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 AEF5519A8 for ; Thu, 7 Jan 2016 19:33:22 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x234.google.com with SMTP id f206so110176792wmf.0 for ; Thu, 07 Jan 2016 11:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=GQyGzsD2toJMmaNMvpDlHP3A1Wo+zUMvtXJG0oBzsLg=; b=Wp4geBenhgeAs+L2e0guSZrW9eH5AL+rnbP1ZcnDYsn+sZzwoefiSBkblGh9IF+rzH B5Yvnwm6SAtU+Yd0KaisDx8sHPTfRd+qkB9ZOBUwJoT2Ywz16uXcYPzj0dlH2YowS4ZD BpeJv5ODaaQa2Ztrn2lQogQcQ9mAJEO8fNFyWuo7c1qqdA0i54vXSjBr9gm7C+TPp6mh CRrFRTC1vtPubV31mObR/I4XFYakOnj//0jKCUWHiKd+wLG6ZK6lc8Xibtn4NgYvAGzi 8LjGW+0k8nAV1ScWulR7VQjECrxQAZweYvCpYahIjwhA4vXcF0g6W/GR7ZdLHhK4huqB CmLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=GQyGzsD2toJMmaNMvpDlHP3A1Wo+zUMvtXJG0oBzsLg=; b=AfwRrCFQLmrTuoORRyMIeDXbBRoM/fnhhF/21i2ZgXNXrZ2/ZKuyYSsjv6hypDxFZr xvNOCloZxmTazxrcLYPGFSllow0Wc9042wc1iZXx6yLrhXzgVOY2K5cDtf8p+6e8CnXT p/8tXfigGBEM3aRFXsM096daSk0zJwwLvGzvuv7qe5YkB50/ndrna7pdgN3YfOVrHb6C 3hJOQneOqysHiy4MLv9OLaPwXmKcpXGfT5mskgn2SStwONYOJWwx+s8ogU9BbSTlSIwH WaSZBK5NKthVPabUCc/771syhP2L2LuC6exWcaDJSiHwXoz6mM4FZPx1VVxlQXgdPzWw pjLA== X-Gm-Message-State: ALoCoQlt+wlFk/KC9ou6nIEIwX1NU07W2rqH7Nd1JGcHzzz61W8ZPXRHXQ7N/SHgFBj95xDGWsQ2QWV8CRH/oxKFm9EcXD/QTiHqm4NGiCB57oeB9mRsoII= MIME-Version: 1.0 X-Received: by 10.194.202.163 with SMTP id kj3mr110906648wjc.93.1452195201210; Thu, 07 Jan 2016 11:33:21 -0800 (PST) Received: by 10.194.85.167 with HTTP; Thu, 7 Jan 2016 11:33:21 -0800 (PST) In-Reply-To: <201508031627.t73GRbTB092225@repo.freebsd.org> References: <201508031627.t73GRbTB092225@repo.freebsd.org> Date: Thu, 7 Jan 2016 20:33:21 +0100 Message-ID: Subject: Re: svn commit: r286234 - head/sys/boot/common From: Oliver Pinter To: Edward Tomasz Napierala Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 07 Jan 2016 19:33:23 -0000 On Mon, Aug 3, 2015 at 6:27 PM, Edward Tomasz Napierala wrote: > Author: trasz > Date: Mon Aug 3 16:27:36 2015 > New Revision: 286234 > URL: https://svnweb.freebsd.org/changeset/base/286234 > > Log: > Fix a problem which made loader(8) load non-kld files twice. > > For example, without this patch, the following three lines > in /boot/loader.conf would result in /boot/root.img being preloaded > twice, and two md(4) devices - md0 and md1 - being created. > > initmd_load="YES" > initmd_type="md_image" > initmd_name="/boot/root.img" > > Reviewed by: marcel@ > MFC after: 1 month Do you still plan to MFC this commit to 10-STABLE / 10.3? > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D3204 > > Modified: > head/sys/boot/common/module.c > > Modified: head/sys/boot/common/module.c > ============================================================================== > --- head/sys/boot/common/module.c Mon Aug 3 14:58:46 2015 (r286233) > +++ head/sys/boot/common/module.c Mon Aug 3 16:27:36 2015 (r286234) > @@ -102,6 +102,7 @@ COMMAND_SET(load, "load", "load a kernel > static int > command_load(int argc, char *argv[]) > { > + struct preloaded_file *fp; > char *typestr; > int dofile, dokld, ch, error; > > @@ -139,6 +140,13 @@ command_load(int argc, char *argv[]) > command_errmsg = "invalid load type"; > return(CMD_ERROR); > } > + > + fp = file_findfile(argv[1], typestr); > + if (fp) { > + sprintf(command_errbuf, "warning: file '%s' already loaded", argv[1]); > + return (CMD_ERROR); > + } > + > return (file_loadraw(argv[1], typestr, 1) ? CMD_OK : CMD_ERROR); > } > /* > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"