svn commit: r353136 - in stable: 11/stand/lua 12/stand/lua

[Kyle Evans]

Author: kevans
Date: Sun Oct  6 04:01:15 2019
New Revision: 353136
URL: https://svnweb.freebsd.org/changeset/base/353136

Log:
  MFC r352314: lualoader: Add reload-conf loader command
  
  This command will trigger a reload of the configuration from disk. This is
  useful if you've changed currdev from recovery media to local disk as much
  as I have over the past ~2 hours and are tired of the extra keystrokes.
  
  This is really just a glorified shortcut, but reload-conf is likely easier
  to remember for other people and does save some keystrokes when reloading
  the configuration. It is also resilient to the underlying config method
  changing interface, but this is unlikely to happen.

Modified:
  stable/11/stand/lua/cli.lua
  stable/11/stand/lua/cli.lua.8
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/stand/lua/cli.lua
  stable/12/stand/lua/cli.lua.8
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/stand/lua/cli.lua
==============================================================================
--- stable/11/stand/lua/cli.lua	Sun Oct  6 03:59:05 2019	(r353135)
+++ stable/11/stand/lua/cli.lua	Sun Oct  6 04:01:15 2019	(r353136)
@@ -126,6 +126,10 @@ cli['boot-conf'] = function(...)
 	core.autoboot(argstr)
 end
 
+cli['reload-conf'] = function(...)
+	config.reload()
+end
+
 -- Used for splitting cli varargs into cmd_name and the rest of argv
 function cli.arguments(...)
 	local argv = {...}

Modified: stable/11/stand/lua/cli.lua.8
==============================================================================
--- stable/11/stand/lua/cli.lua.8	Sun Oct  6 03:59:05 2019	(r353135)
+++ stable/11/stand/lua/cli.lua.8	Sun Oct  6 04:01:15 2019	(r353136)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 31, 2018
+.Dd September 13, 2019
 .Dt CLI.LUA 8
 .Os
 .Sh NAME
@@ -82,14 +82,27 @@ As of present, the
 module by default provides commands for
 .Ic autoboot ,
 .Ic boot ,
+.Ic boot-conf ,
 and
-.Ic boot-conf.
-In all three cases, the
+.Ic reload-conf .
+.Pp
+For
+.Ic autoboot ,
+.Ic boot ,
+and
+.Ic boot-conf ,
+the
 .Xr core.lua 8
 module will load all ELF modules as-needed before executing the equivalent
 built-in loader commands.
 All non-kernel arguments to these commands are passed in the same order to the
 loader command.
+.Pp
+The
+.Ic reload-conf
+command will reload the configuration from disk.
+This is useful if you have manually changed currdev and would like to easily
+reload the configuration from the new device.
 .Ss Exported Functions
 The following functions are exported from
 .Nm :