From owner-svn-src-stable@freebsd.org  Wed Jul 19 19:06:20 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAF9DD7C132;
 Wed, 19 Jul 2017 19:06:20 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA34C67908;
 Wed, 19 Jul 2017 19:06:20 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6JJ6Jwc087557;
 Wed, 19 Jul 2017 19:06:19 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6JJ6JNL087555;
 Wed, 19 Jul 2017 19:06:19 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707191906.v6JJ6JNL087555@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Wed, 19 Jul 2017 19:06:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r321232 - stable/11/sys/boot/common
X-SVN-Group: stable-11
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: stable/11/sys/boot/common
X-SVN-Commit-Revision: 321232
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jul 2017 19:06:21 -0000

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)