d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a MD_ROOT_FSTYPE kernel option. The option specifies the

Browse Source 
file system part for the MD_ROOT mount string. Hardcoding the
the file system type as "ufs" is too restrictive.
This commit is contained in:
Marcel Moolenaar 2012-11-03 21:20:55 +00:00
parent d3576a3f9d
commit 22ff74b2f4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/conf/options
View File

@ -139,6 +139,7 @@ MAC_STATIC opt_mac.h
MAC_STUB opt_dontuse.h MAC_STUB opt_dontuse.h
MAC_TEST opt_dontuse.h MAC_TEST opt_dontuse.h
MD_ROOT opt_md.h MD_ROOT opt_md.h
MD_ROOT_FSTYPE opt_md.h
MD_ROOT_SIZE opt_md.h MD_ROOT_SIZE opt_md.h
MFI_DEBUG opt_mfi.h MFI_DEBUG opt_mfi.h
MFI_DECODE_LOG opt_mfi.h MFI_DECODE_LOG opt_mfi.h

6
sys/dev/md/md.c
View File

@ -110,6 +110,10 @@ static int md_malloc_wait;
SYSCTL_INT(_vm, OID_AUTO, md_malloc_wait, CTLFLAG_RW, &md_malloc_wait, 0, SYSCTL_INT(_vm, OID_AUTO, md_malloc_wait, CTLFLAG_RW, &md_malloc_wait, 0,
"Allow malloc to wait for memory allocations"); "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) #if defined(MD_ROOT) && defined(MD_ROOT_SIZE)
/* /*
* Preloaded image gets put here. * Preloaded image gets put here.
@ -1328,7 +1332,7 @@ md_preloaded(u_char *image, size_t length)
sc->start = mdstart_preload; sc->start = mdstart_preload;
#ifdef MD_ROOT #ifdef MD_ROOT
if (sc->unit == 0) if (sc->unit == 0)
rootdevnames[0] = "ufs:/dev/md0"; rootdevnames[0] = MD_ROOT_FSTYPE ":/dev/md0";
#endif #endif
mdinit(sc); mdinit(sc);
} }