From d1004bbafb12054c6e5ca02a45fcc08a3d332001 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 3 Apr 2020 18:26:38 +0200
Subject: wwan: T1988: minor cleanups

---
 src/conf_mode/interfaces-wirelessmodem.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/conf_mode/interfaces-wirelessmodem.py')

diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index 4b681a018..7aee5c9bd 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -70,8 +70,8 @@ CONNECT ''
 
 """
 
-config_wwan_ip_pre_up_tmpl = """#!/bin/sh
-# As PPPoE is an "on demand" interface we need to re-configure it when it
+config_wwan_ip_up_tmpl = """#!/bin/sh
+# As WWAN is an "on demand" interface we need to re-configure it when it
 # becomes 'up'
 
 ipparam=$6
@@ -87,6 +87,8 @@ fi
 DIALER_PID=$(cat /var/run/{{ intf }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
 
+echo "{{ description }}" > /sys/class/net/{{ intf }}/ifalias
+
 {% if vrf -%}
 logger -t pppd[$DIALER_PID] "configuring interface {{ intf }} for VRF {{ vrf }}"
 ip link set dev {{ intf }} master {{ vrf }}
@@ -204,9 +206,10 @@ def verify(wwan):
     return None
 
 def generate(wwan):
-    config_file_wwan = f"/etc/ppp/peers/{wwan['intf']}"
+    intf = wwan['intf']
+    config_file_wwan = f'/etc/ppp/peers/{intf}'
     config_file_wwan_chat = wwan['chat_script']
-    ip_up_script_file = f"/etc/ppp/ip-up.d/9991-vyos-vrf-{wwan['intf']}"
+    ip_up_script_file = f'/etc/ppp/ip-up.d/9991-vyos-vrf-{intf}'
 
     config_files = [config_file_wwan, config_file_wwan_chat, ip_up_script_file]
 
@@ -217,7 +220,7 @@ def generate(wwan):
             os.mkdir(dirname)
 
     # Always hang-up WWAN connection prior generating new configuration file
-    cmd = f"systemctl stop ppp@{wwan['intf']}.service"
+    cmd = f'systemctl stop ppp@{intf}.service'
     subprocess_cmd(cmd)
 
     if wwan['deleted']:
@@ -240,7 +243,7 @@ def generate(wwan):
             f.write(config_text)
 
         # Create ip-pre-up script
-        tmpl = Template(config_wwan_ip_pre_up_tmpl)
+        tmpl = Template(config_wwan_ip_up_tmpl)
         config_text = tmpl.render(wwan)
         with open(ip_up_script_file, 'w') as f:
             f.write(config_text)
@@ -256,8 +259,9 @@ def apply(wwan):
         return None
 
     if not wwan['disable']:
-        # dial WWAN connection
-        cmd = f"systemctl start ppp@{wwan['intf']}.service"
+        # "dial" WWAN connection
+        intf = wwan['intf']
+        cmd = f'systemctl start ppp@{intf}.service'
         subprocess_cmd(cmd)
 
         # make logfile owned by root / vyattacfg
-- 
cgit v1.2.3