From ffe34bf3753e8b721e3deb8ec1432f534665eaf3 Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Tue, 5 Apr 2016 13:58:26 -0700 Subject: [PATCH] Reinstall the mlockall(2) command Requested by: jefferai --- command/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/command/server.go b/command/server.go index c151a960aa..0601a09bb8 100644 --- a/command/server.go +++ b/command/server.go @@ -124,8 +124,9 @@ func (c *ServerCommand) Run(args []string) int { return 1 } - // If mlockall(2) isn't supported, show a warning (even in dev mode). - if !mlock.Supported() { + // If mlockall(2) isn't supported, show a warning. We disable this + // in dev because it is quite scary to see when first using Vault. + if !dev && !mlock.Supported() { c.Ui.Output("==> WARNING: mlock not supported on this system!\n") c.Ui.Output(" An `mlockall(2)`-like syscall to prevent memory from being") c.Ui.Output(" swapped to disk is not supported on this system. Running")