From 15fe15d0b29592b36af4e87fc81dd6755708fa2e Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 2 Jan 2019 10:40:54 +0100
Subject: T1146: run postconfig scripts from vyos-router startup script to
force correct ordering.
---
scripts/init/vyos-router | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router
index b4606f1..adeda2e 100755
--- a/scripts/init/vyos-router
+++ b/scripts/init/vyos-router
@@ -110,6 +110,18 @@ run_preconfig_script ()
fi
}
+# execute the post-config scripts
+run_postconfig_scripts ()
+{
+ if [ -x /config/scripts/vyatta-postconfig-bootup.script ]; then
+ /config/scripts/vyatta-postconfig-bootup.script
+ fi
+
+ if [ -x /config/scripts/vyos-postconfig-bootup.script ]; then
+ /config/scripts/vyos-postconfig-bootup.script
+ fi
+}
+
run_postupgrade_script ()
{
if [ -f /config/.upgraded ]; then
@@ -209,6 +221,8 @@ start ()
telinit q
chmod g-w,o-w /
+
+ run_postconfig_scripts
}
stop()
--
cgit v1.2.3
From af6d5a191eeeaa810f5ae7896357e1e2ff2ec511 Mon Sep 17 00:00:00 2001
From: xrpixer <xrpixer@gmail.com>
Date: Fri, 11 Jan 2019 11:41:09 -0600
Subject: T1068: Increase Max CMD Output
---
src/cstore/cstore.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cstore/cstore.hpp b/src/cstore/cstore.hpp
index 60b5b65..53d9c53 100644
--- a/src/cstore/cstore.hpp
+++ b/src/cstore/cstore.hpp
@@ -84,7 +84,7 @@ public:
static const string C_ENUM_SCRIPT_DIR;
static const string C_LOGFILE_STDOUT;
- static const size_t MAX_CMD_OUTPUT_SIZE = 4096;
+ static const size_t MAX_CMD_OUTPUT_SIZE = 40960;
// for sorting
/* apparently unordered_map template does not work with "enum" type, so
--
cgit v1.2.3