summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-04 22:14:12 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-04 22:14:14 +0200
commit08235013e5c950967fc807ba9f14e408aa0c9302 (patch)
tree0c7238969fe3f15948dea5903ac61a863d9e1710 /src
parent2c6737376571959d57095dda2d967bf67feeea8f (diff)
downloadvyos-1x-08235013e5c950967fc807ba9f14e408aa0c9302.tar.gz
vyos-1x-08235013e5c950967fc807ba9f14e408aa0c9302.zip
vyos.util: rename chmod_x_file() to chmod_x()
Now both files and directories are supported.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-pppoe.py10
-rwxr-xr-xsrc/conf_mode/interfaces-wirelessmodem.py8
2 files changed, 9 insertions, 9 deletions
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index 37934263c..a396af4ea 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -24,7 +24,7 @@ from netifaces import interfaces
from vyos.config import Config
from vyos.defaults import directories as vyos_data_dir
from vyos.ifconfig import Interface
-from vyos.util import chown_file, chmod_x_file, subprocess_cmd
+from vyos.util import chown_file, chmod_x, subprocess_cmd
from vyos import ConfigError
default_config_data = {
@@ -223,10 +223,10 @@ def generate(pppoe):
f.write(config_text)
# make generated script file executable
- chmod_x_file(script_pppoe_pre_up)
- chmod_x_file(script_pppoe_ip_up)
- chmod_x_file(script_pppoe_ip_down)
- chmod_x_file(script_pppoe_ipv6_up)
+ chmod_x(script_pppoe_pre_up)
+ chmod_x(script_pppoe_ip_up)
+ chmod_x(script_pppoe_ip_down)
+ chmod_x(script_pppoe_ipv6_up)
return None
diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index d00259bf5..9b6de2d12 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -23,7 +23,7 @@ from netifaces import interfaces
from vyos.config import Config
from vyos.defaults import directories as vyos_data_dir
-from vyos.util import chown_file, chmod_x_file, subprocess_cmd
+from vyos.util import chown_file, chmod_x, subprocess_cmd
from vyos import ConfigError
default_config_data = {
@@ -197,9 +197,9 @@ def generate(wwan):
f.write(config_text)
# make generated script file executable
- chmod_x_file(script_wwan_pre_up)
- chmod_x_file(script_wwan_ip_up)
- chmod_x_file(script_wwan_ip_down)
+ chmod_x(script_wwan_pre_up)
+ chmod_x(script_wwan_ip_up)
+ chmod_x(script_wwan_ip_down)
return None