From 22ff74b2f44234d31540b1f7fd6c91489c37cad3 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 3 Nov 2012 21:20:55 +0000
Subject: [PATCH] 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.

---
 sys/conf/options | 1 +
 sys/dev/md/md.c  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys/conf/options b/sys/conf/options
index 574d2e2bdec1..1fb3a2a96988 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -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
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 2384111158a7..a86c26aa58f4 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -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 length)
 	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);
 }