Tweak wording
authorQuentin Smith <quentin@mit.edu>
Sun, 20 May 2018 23:28:34 +0000 (19:28 -0400)
committerQuentin Smith <quentin@mit.edu>
Sun, 20 May 2018 23:28:34 +0000 (19:28 -0400)
code/main.py
debian/changelog

index 005f4b0..5e37889 100755 (executable)
@@ -500,13 +500,15 @@ def getNicInfo(data_dict, machine):
         data_dict['nic%s_netmask' % i] = machine.nics[i].netmask
         data_dict['nic%s_gateway' % i] = machine.nics[i].gateway
         if machine.nics[i].other_ip:
-            nic_fields.append(('nic%s_other' % i, 'NIC %s Other Address'))
+            nic_fields.append(('nic%s_other' % i, 'NIC %s Other Address' % i))
             other = '%s/%s via %s' % (machine.nics[i].other_ip, machine.nics[i].other_netmask, machine.nics[i].other_gateway)
             other_action = machine.nics[i].other_action
             if other_action == 'dnat':
                 other += " (NAT to primary IP)"
             elif other_action == 'renumber':
-                other += " (cold boot to swap)"
+                other += " (cold boot or renew DHCP lease to swap)"
+            elif other_action == 'renumber_dhcp':
+                other += " (renew DHCP lease to swap)"
             else:
                 # No message for renumber_dhcp since we don't know if
                 # they're using DHCP.
index 74b1f1a..4c8de06 100644 (file)
@@ -1,3 +1,9 @@
+invirt-web (0.1.49) unstable; urgency=low
+
+  * Tweak wording.
+
+ -- Quentin Smith <quentin@mit.edu>  Sun, 20 May 2018 19:28:28 -0400
+
 invirt-web (0.1.48) unstable; urgency=low
 
   * Fix typo