Changeset 25901

Timestamp:

2011-03-06T19:57:14+01:00 (7 years ago)

Author:

cshore

Message:

[net] miniupnpd: Added uci configuration option to set uuid. A uuid is automatically generated and added to the configuration file on the first boot of miniupnpd with no uuid. This closes: #6634. Current behaviour (non-unique UUID by way of no UUID being configured) can be obtained by using a uuid of 'nocli' (for no command line [uuid])

File:

• packages/net/miniupnpd/files/miniupnpd.init (modified) (3 diffs)

packages/net/miniupnpd/files/miniupnpd.init

@@ -9 +9 @@
         local extiface intiface upload download logging secure enabled natpmp
         local extip port usesysuptime conffile serial_number model_number
+        local uuid
 
         config_get extiface config external_iface
@@ -24 +25 @@
         config_get serial_number config serial_number
         config_get model_number config model_number
+        config_get uuid config uuid
 
         include /lib/network
@@ -68 +70 @@
                         append args "-m ${model_number}"
                         
+                [ -z "$uuid" ] && {
+                        uuid="$(cat /proc/sys/kernel/random/uuid)"
+                        uci set upnpd.config.uuid=$uuid
+                        uci commit upnpd
+                }
+
+                [ "$uuid" = "nocli" ] || \
+                        append args "-u $uuid"
+                
                 # start firewall
                 local zone