summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/quagga-reload.py6
-rw-r--r--vtysh/vtysh.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/quagga-reload.py b/tools/quagga-reload.py
index 22d44b3369..f90b3e95fc 100755
--- a/tools/quagga-reload.py
+++ b/tools/quagga-reload.py
@@ -708,15 +708,15 @@ if __name__ == '__main__':
# Verify that 'service integrated-vtysh-config' is configured
vtysh_filename = '/etc/quagga/vtysh.conf'
- service_integrated_vtysh_config = False
+ service_integrated_vtysh_config = True
if os.path.isfile(vtysh_filename):
with open(vtysh_filename, 'r') as fh:
for line in fh.readlines():
line = line.strip()
- if line == 'service integrated-vtysh-config':
- service_integrated_vtysh_config = True
+ if line == 'no service integrated-vtysh-config':
+ service_integrated_vtysh_config = False
break
if not service_integrated_vtysh_config:
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index abd5d04f44..ad43f41fd9 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -71,7 +71,7 @@ struct vtysh_client vtysh_client[] =
};
/* Using integrated config from Quagga.conf. Default is no. */
-int vtysh_writeconfig_integrated = 0;
+int vtysh_writeconfig_integrated = 1;
extern char config_default[];