svn commit: r321232 - stable/11/sys/boot/common
Ngie Cooper
ngie at FreeBSD.org
Wed Jul 19 19:06:21 UTC 2017
Author: ngie
Date: Wed Jul 19 19:06:19 2017
New Revision: 321232
URL: https://svnweb.freebsd.org/changeset/base/321232
Log:
MFC r316076:
sys/boot/common: Make geli(4) support optional in MI sources
This saves a negligible amount of memory for non-geli enabled
bootloaders.
Modified:
stable/11/sys/boot/common/Makefile.inc
stable/11/sys/boot/common/module.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/boot/common/Makefile.inc
==============================================================================
--- stable/11/sys/boot/common/Makefile.inc Wed Jul 19 19:02:06 2017 (r321231)
+++ stable/11/sys/boot/common/Makefile.inc Wed Jul 19 19:06:19 2017 (r321232)
@@ -39,6 +39,9 @@ CFLAGS+= -DLOADER_GPT_SUPPORT
CFLAGS+= -DLOADER_MBR_SUPPORT
.endif
.endif
+.if !defined(LOADER_NO_GELI_SUPPORT)
+CFLAGS+= -DLOADER_GELI_SUPPORT
+.endif
.if defined(HAVE_BCACHE)
SRCS+= bcache.c
Modified: stable/11/sys/boot/common/module.c
==============================================================================
--- stable/11/sys/boot/common/module.c Wed Jul 19 19:02:06 2017 (r321231)
+++ stable/11/sys/boot/common/module.c Wed Jul 19 19:06:19 2017 (r321232)
@@ -180,6 +180,7 @@ command_load(int argc, char *argv[])
return (error == 0 ? CMD_OK : CMD_CRIT);
}
+#ifdef LOADER_GELI_SUPPORT
COMMAND_SET(load_geli, "load_geli", "load a geli key", command_load_geli);
static int
@@ -217,6 +218,7 @@ command_load_geli(int argc, char *argv[])
sprintf(typestr, "%s:geli_keyfile%d", argv[1], num);
return (file_loadraw(argv[2], typestr, 1) ? CMD_OK : CMD_ERROR);
}
+#endif
void
unload(void)
More information about the svn-src-stable-11
mailing list