summaryrefslogtreecommitdiff
path: root/nest/cmds.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2012-12-26 12:40:48 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2012-12-26 12:40:48 +0100
commita92cf57dd6ba021a495fe7268c86dc8e6aeecbb2 (patch)
tree1df35ec36e661dbdcd3b6065d86df651b2d240c7 /nest/cmds.c
parent80a9cadc76101157707aecc0b482ad88ad702fc3 (diff)
Implements undo command and optional timeout for configuration
Several new configure command variants: configure undo - undo last reconfiguration configure timeout - configure with scheduled undo if not confirmed in timeout configure confirm - confirm last configuration configure check - just parse and validate config file
Diffstat (limited to 'nest/cmds.c')
-rw-r--r--nest/cmds.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/nest/cmds.c b/nest/cmds.c
index 2a803930..54ace169 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -14,6 +14,9 @@
#include "lib/string.h"
#include "lib/resource.h"
+extern int shutting_down;
+extern int configuring;
+
void
cmd_show_status(void)
{
@@ -27,9 +30,10 @@ cmd_show_status(void)
cli_msg(-1011, "Last reboot on %s", tim);
tm_format_datetime(tim, &config->tf_base, config->load_time);
cli_msg(-1011, "Last reconfiguration on %s", tim);
+
if (shutting_down)
cli_msg(13, "Shutdown in progress");
- else if (old_config)
+ else if (configuring)
cli_msg(13, "Reconfiguration in progress");
else
cli_msg(13, "Daemon is up and running");