1 files changed, 11 insertions, 8 deletions
diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index 14178d74c..9efad3b8d 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -31,19 +31,14 @@ config_wwan_tmpl = """### Autogenerated by interfaces-wirelessmodem.py ###
 {% if description %}
 # {{ description }}
 {% endif %}
-
-# physical device
-/dev/{{ device }}
-
-ipparam {{ intf }} {{ metric }}
 ifname {{ intf }}
+ipparam "{{ intf }} {{ metric }}"
 linkname {{ intf }}
-{% if on_demand -%}
-demand
-{%- endif %}
 {% if name_server -%}
 usepeerdns
 {%- endif %}
+# physical device
+/dev/{{ device }}
 lcp-echo-failure 0
 115200
 debug
@@ -56,6 +51,9 @@ noauth
 crtscts
 lock
 persist
+{% if on_demand -%}
+demand
+{%- endif %}
 
 connect '/usr/sbin/chat -v -t6 -f {{ chat_script }}'
 
@@ -187,6 +185,11 @@ def generate(wwan):
             os.unlink(wwan['chat_script'])
 
     else:
+        # PPP peers directory
+        dirname = os.path.dirname(config_file_wwan)
+        if not os.path.isdir(dirname):
+            os.mkdir(dirname)
+
         # Create PPP configuration files
         tmpl = Template(config_wwan_tmpl)
         config_text = tmpl.render(wwan)