svn commit: r242525 - in head/sys: conf dev/md

[Marcel Moolenaar]

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);
 }