Parcourir la source

Consistent variable name

Bob Mottram il y a 8 ans
Parent
révision
5b1b0b82fd
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 1
    1
      src/freedombone-controlpanel
  2. 2
    2
      src/freedombone-utils-wifi

+ 1
- 1
src/freedombone-controlpanel Voir le fichier

1342
         fi
1342
         fi
1343
         if [ $ip_addresses_have_changed ]; then
1343
         if [ $ip_addresses_have_changed ]; then
1344
             write_config_param "NETWORK_IS_STATIC" "1"
1344
             write_config_param "NETWORK_IS_STATIC" "1"
1345
-            write_config_param "STATIC_IP_ADDRESS" "$NEW_STATIC_IP"
1345
+            write_config_param "LOCAL_NETWORK_STATIC_IP_ADDRESS" "$NEW_STATIC_IP"
1346
             write_config_param "ROUTER_IP_ADDRESS" "$NEW_STATIC_GATEWAY"
1346
             write_config_param "ROUTER_IP_ADDRESS" "$NEW_STATIC_GATEWAY"
1347
 
1347
 
1348
             email_change_relay "$NEW_STATIC_IP"
1348
             email_change_relay "$NEW_STATIC_IP"

+ 2
- 2
src/freedombone-utils-wifi Voir le fichier

55
         echo '#this line must always be here' >> /etc/network/interfaces
55
         echo '#this line must always be here' >> /etc/network/interfaces
56
         echo 'iface default inet dhcp' >> /etc/network/interfaces
56
         echo 'iface default inet dhcp' >> /etc/network/interfaces
57
     else
57
     else
58
-        read_config_param "STATIC_IP_ADDRESS"
58
+        read_config_param "LOCAL_NETWORK_STATIC_IP_ADDRESS"
59
         read_config_param "ROUTER_IP_ADDRESS"
59
         read_config_param "ROUTER_IP_ADDRESS"
60
         echo '#static address' >> /etc/network/interfaces
60
         echo '#static address' >> /etc/network/interfaces
61
         echo 'iface default inet static' >> /etc/network/interfaces
61
         echo 'iface default inet static' >> /etc/network/interfaces
62
-        echo "    address ${STATIC_IP_ADDRESS}" >> /etc/network/interfaces
62
+        echo "    address ${LOCAL_NETWORK_STATIC_IP_ADDRESS}" >> /etc/network/interfaces
63
         echo '    netmask 255.255.255.0' >> /etc/network/interfaces
63
         echo '    netmask 255.255.255.0' >> /etc/network/interfaces
64
         echo "    gateway ${ROUTER_IP_ADDRESS}" >> /etc/network/interfaces
64
         echo "    gateway ${ROUTER_IP_ADDRESS}" >> /etc/network/interfaces
65
     fi
65
     fi