summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-05 20:33:28 +0100
committerChristian Poessinger <christian@poessinger.com>2020-03-05 20:33:28 +0100
commitab648ec98610d41a759d380000e4dce7c181cf3b (patch)
tree99eec7a0b1d3aaddfa9ca5660a659c18362347ff
parentd3f79422514d65d19dc2b1085f0e19c51f831be7 (diff)
downloadvyos-1x-ab648ec98610d41a759d380000e4dce7c181cf3b.tar.gz
vyos-1x-ab648ec98610d41a759d380000e4dce7c181cf3b.zip
pppoe: T1493: fix for fix of invalid reference of ipv6-up script file
Commit d161cbb ("pppoe: T1493: fix invalid reference of ipv6-up script file") actually introduced another bug instead of fixing it. It was catched by vyos-smoketest ... luckily! Sorry!
-rwxr-xr-xsrc/conf_mode/interfaces-pppoe.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index 8002f55fa..0b7d8e9cb 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -295,13 +295,13 @@ def generate(pppoe):
# Create PPP configuration files
tmpl = Template(config_pppoe_tmpl)
config_text = tmpl.render(pppoe)
- with open(ipv6_ifup_script_file, 'w') as f:
+ with open(config_file_pppoe, 'w') as f:
f.write(config_text)
script_file = '/etc/ppp/ipv6-up.d/50-vyos-{}-autoconf'.format(pppoe['intf'])
tmpl = Template(config_pppoe_ipv6_up_tmpl)
config_text = tmpl.render(pppoe)
- with open(script_file, 'w') as f:
+ with open(ipv6_ifup_script_file, 'w') as f:
f.write(config_text)
os.chmod(script_file, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)