summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-geneve.py2
-rwxr-xr-xsrc/conf_mode/interfaces-vxlan.py2
-rwxr-xr-xsrc/helpers/vyos-merge-config.py3
-rwxr-xr-xsrc/op_mode/powerctrl.py8
-rwxr-xr-xsrc/services/vyos-http-api-server2
-rwxr-xr-xsrc/utils/vyos-config-to-commands8
6 files changed, 6 insertions, 19 deletions
diff --git a/src/conf_mode/interfaces-geneve.py b/src/conf_mode/interfaces-geneve.py
index ba684b553..7322e0c50 100755
--- a/src/conf_mode/interfaces-geneve.py
+++ b/src/conf_mode/interfaces-geneve.py
@@ -19,10 +19,8 @@ import os
from sys import exit
from copy import deepcopy
-from vyos.configdict import list_diff
from vyos.config import Config
from vyos.ifconfig import GeneveIf, Interface
-from vyos.interfaces import get_type_of_interface
from vyos import ConfigError
from netifaces import interfaces
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index 30ff1755d..c1fedc824 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -19,10 +19,8 @@ import os
from sys import exit
from copy import deepcopy
-from vyos.configdict import list_diff
from vyos.config import Config
from vyos.ifconfig import VXLANIf, Interface
-from vyos.interfaces import get_type_of_interface
from vyos import ConfigError
from netifaces import interfaces
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py
index e9a14ae98..7ae62cfb3 100755
--- a/src/helpers/vyos-merge-config.py
+++ b/src/helpers/vyos-merge-config.py
@@ -72,9 +72,6 @@ merge_config_tree = ConfigTree(config_file)
effective_config = Config()
output_effective_config = effective_config.show_config()
-# showConfig (called by config.show_config() does not escape
-# backslashes, which configtree expects; cf. T1001.
-output_effective_config = output_effective_config.replace("\\", "\\\\")
effective_config_tree = ConfigTree(output_effective_config)
diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py
index e3644e063..46ebf5ffb 100755
--- a/src/op_mode/powerctrl.py
+++ b/src/op_mode/powerctrl.py
@@ -60,7 +60,11 @@ def check_shutdown():
def cancel_shutdown():
try:
- cmd = check_output(["/sbin/shutdown","-c"])
+ timenow = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+ cmd = check_output(["/sbin/shutdown","-c","--no-wall"])
+ message = "Reboot scheduled has been cancelled %s" % timenow
+ #Generate broadcast message about cancel reboot
+ os.system("wall %s" % message)
except CalledProcessError as e:
sys.exit("Error aborting shutdown: %s" % e)
@@ -105,7 +109,7 @@ def execute_shutdown(time, reboot = True, ask=True):
else:
sys.exit("Could not decode time and date")
- print(cmd.decode().split(",",1)[0])
+ check_shutdown()
def chk_vyatta_based_reboots():
### T870 commit-confirm is still using the vyatta code base, once gone, the code below can be removed
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 9b6d7e979..1abaed873 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -24,7 +24,6 @@ import traceback
import threading
import vyos.config
-import vyos.util
import bottle
@@ -213,7 +212,6 @@ def get_value():
config_format = command['configFormat']
res = session.show_config(path=command['path'])
- res = vyos.util.escape_backslash(res)
if config_format == 'json':
config_tree = vyos.configtree.ConfigTree(res)
res = json.loads(config_tree.to_json())
diff --git a/src/utils/vyos-config-to-commands b/src/utils/vyos-config-to-commands
index 7147bc5ff..8b50f7c5d 100755
--- a/src/utils/vyos-config-to-commands
+++ b/src/utils/vyos-config-to-commands
@@ -19,14 +19,6 @@ else:
except OSError as e:
print("Could not read config file {0}: {1}".format(file_name, e), file=sys.stderr)
-# This script is usually called with the output of "cli-shell-api showCfg", which does not
-# escape backslashes. "ConfigTree()" expects escaped backslashes when parsing a config
-# string (and also prints them itself). Therefore this script would fail.
-# Manually escape backslashes here to handle backslashes in any configuration strings
-# properly. The alternative would be to modify the output of "cli-shell-api showCfg",
-# but that may be break other things who rely on that specific output.
-config_string = config_string.replace("\\", "\\\\")
-
try:
config = ConfigTree(config_string)
commands = config.to_commands()