From 29c4c5a833e4fcd164885cc531fcb9e20df7a4b1 Mon Sep 17 00:00:00 2001
From: zbchristian <33725910+zbchristian@users.noreply.github.com>
Date: Sat, 24 Apr 2021 11:11:48 +0200
Subject: [PATCH 1/2] Fix default device name numbering in UDEV rule

---
 ajax/networking/save_net_dev_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ajax/networking/save_net_dev_config.php b/ajax/networking/save_net_dev_config.php
index 57c4c30f..be2c04dd 100644
--- a/ajax/networking/save_net_dev_config.php
+++ b/ajax/networking/save_net_dev_config.php
@@ -67,7 +67,7 @@ if (isset($_POST['interface'])) {
             }
             // create new entry
             if ( ($type != $newtype) || !empty($name) ) { // new device type or new name
-                if (empty($name)) $name = $prefix."*";
+                if (empty($name)) $name = $prefix."%n";
                 if (!empty($mac)) $rule = preg_replace("/\\\$MAC\\\$/i", $mac, $rulenew);
                 if (!empty($vid)) $rule = preg_replace("/\\\$IDVENDOR\\\$/i", $vid, $rule);
                 if (!empty($pid)) $rule = preg_replace("/\\\$IDPRODUCT\\\$/i", $pid, $rule);

From 9d132bee3a00b34247921fda1ce1d6045ebcafe1 Mon Sep 17 00:00:00 2001
From: zbchristian <33725910+zbchristian@users.noreply.github.com>
Date: Sat, 24 Apr 2021 11:17:25 +0200
Subject: [PATCH 2/2] Fix naming of hilink devices

---
 config/client_config/80-raspap-net-devices.rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/client_config/80-raspap-net-devices.rules b/config/client_config/80-raspap-net-devices.rules
index 0ccb49a1..33e6584c 100644
--- a/config/client_config/80-raspap-net-devices.rules
+++ b/config/client_config/80-raspap-net-devices.rules
@@ -1,3 +1,3 @@
-SUBSYSTEM=="net", ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="14db", NAME="hilink0",  TAG+="systemd", ENV{SYSTEMD_WANTS}="start start_huawei_hilink.service"
+SUBSYSTEM=="net", ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="14db", NAME="hilink%n",  TAG+="systemd", ENV{SYSTEMD_WANTS}="start start_huawei_hilink.service"