From owner-svn-src-head@FreeBSD.ORG  Sat Nov  1 18:51:49 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D557C05;
 Sat,  1 Nov 2014 18:51:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 795238F1;
 Sat,  1 Nov 2014 18:51:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1Ipn8e082127;
 Sat, 1 Nov 2014 18:51:49 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1IpnCB082126;
 Sat, 1 Nov 2014 18:51:49 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201411011851.sA1IpnCB082126@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 1 Nov 2014 18:51:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273940 - head/sys/boot/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Nov 2014 18:51:49 -0000

Author: marcel
Date: Sat Nov  1 18:51:48 2014
New Revision: 273940
URL: https://svnweb.freebsd.org/changeset/base/273940

Log:
  Change the order of the arguments to file_loadraw(). They were swapped
  as of r262345 when file_loadraw() was made public and this little detail
  got overlooked during porting.
  
  Obtained from:	Juniper Networks, Inc.

Modified:
  head/sys/boot/common/install.c

Modified: head/sys/boot/common/install.c
==============================================================================
--- head/sys/boot/common/install.c	Sat Nov  1 17:52:04 2014	(r273939)
+++ head/sys/boot/common/install.c	Sat Nov  1 18:51:48 2014	(r273940)
@@ -286,7 +286,7 @@ install(char *pkgname)
 	}
 
 	s = (inst_rootfs == NULL) ? "/install.iso" : inst_rootfs;
-	if (file_loadraw("mfs_root", s) == NULL) {
+	if (file_loadraw(s, "mfs_root") == NULL) {
 		error = errno;
 		command_errmsg = "cannot load root file system";
 		goto fail;