From owner-svn-src-head@FreeBSD.ORG  Sat Nov  3 21:20:56 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 28FD91000;
 Sat,  3 Nov 2012 21:20:56 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 10A998FC08;
 Sat,  3 Nov 2012 21:20:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA3LKtqu046825;
 Sat, 3 Nov 2012 21:20:55 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA3LKthY046822;
 Sat, 3 Nov 2012 21:20:55 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201211032120.qA3LKthY046822@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 3 Nov 2012 21:20:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242525 - in head/sys: conf dev/md
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.14
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, 03 Nov 2012 21:20:56 -0000

Author: marcel
Date: Sat Nov  3 21:20:55 2012
New Revision: 242525
URL: http://svn.freebsd.org/changeset/base/242525

Log:
  Add a MD_ROOT_FSTYPE kernel option. The option specifies the
  file system part for the MD_ROOT mount string. Hardcoding the
  the file system type as "ufs" is too restrictive.

Modified:
  head/sys/conf/options
  head/sys/dev/md/md.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sat Nov  3 21:08:27 2012	(r242524)
+++ head/sys/conf/options	Sat Nov  3 21:20:55 2012	(r242525)
@@ -139,6 +139,7 @@ MAC_STATIC	opt_mac.h
 MAC_STUB	opt_dontuse.h
 MAC_TEST	opt_dontuse.h
 MD_ROOT		opt_md.h
+MD_ROOT_FSTYPE	opt_md.h
 MD_ROOT_SIZE	opt_md.h
 MFI_DEBUG	opt_mfi.h
 MFI_DECODE_LOG	opt_mfi.h

Modified: head/sys/dev/md/md.c
==============================================================================
--- head/sys/dev/md/md.c	Sat Nov  3 21:08:27 2012	(r242524)
+++ head/sys/dev/md/md.c	Sat Nov  3 21:20:55 2012	(r242525)
@@ -110,6 +110,10 @@ static int md_malloc_wait;
 SYSCTL_INT(_vm, OID_AUTO, md_malloc_wait, CTLFLAG_RW, &md_malloc_wait, 0,
     "Allow malloc to wait for memory allocations");
 
+#if defined(MD_ROOT) && !defined(MD_ROOT_FSTYPE)
+#define	MD_ROOT_FSTYPE	"ufs"
+#endif
+
 #if defined(MD_ROOT) && defined(MD_ROOT_SIZE)
 /*
  * Preloaded image gets put here.
@@ -1328,7 +1332,7 @@ md_preloaded(u_char *image, size_t lengt
 	sc->start = mdstart_preload;
 #ifdef MD_ROOT
 	if (sc->unit == 0)
-		rootdevnames[0] = "ufs:/dev/md0";
+		rootdevnames[0] = MD_ROOT_FSTYPE ":/dev/md0";
 #endif
 	mdinit(sc);
 }