diff --git a/src/plugins/network-manager/add_network.py b/src/plugins/network-manager/add_network.py index f02552a..c7ceb0a 100644 --- a/src/plugins/network-manager/add_network.py +++ b/src/plugins/network-manager/add_network.py @@ -37,7 +37,7 @@ class AddNetwork(AbstractPlugin): self.netmask, self.gateway) else: - self.content = 'auto {0}\n iface {0} inet static\n#address {1}\n#netmask {2}\n#gateway {3}\n'.format(self.name, + self.content = 'auto {0}\niface {0} inet static\n#address {1}\n#netmask {2}\n#gateway {3}\n'.format(self.name, self.ip, self.netmask, self.gateway) diff --git a/src/plugins/network-manager/delete_network.py b/src/plugins/network-manager/delete_network.py index 62451e3..104b52e 100644 --- a/src/plugins/network-manager/delete_network.py +++ b/src/plugins/network-manager/delete_network.py @@ -47,7 +47,7 @@ class DeleteNetwork(AbstractPlugin): self.content = '#auto {0}\n'.format(self.name) if line.startswith(self.content): - counter = 4 + counter = 3 else: print(str(line).strip()) @@ -57,17 +57,25 @@ class DeleteNetwork(AbstractPlugin): else: self.content = '#auto {0}\n'.format(self.name) - if not line.startswith(self.content): + if line.startswith(self.content): + counter = 1 + else: print(str(line).strip()) + # if not line.startswith(self.content): + # print(str(line).strip()) + elif self.type == 'loopback': if self.is_active is True: self.content = 'auto {0}\n'.format(self.name) else: - self.content = '#auto {0}\n'.format(self.name) + self.content = 'auto {0}\n'.format(self.name) - if not line.startswith(self.content): + if line.startswith(self.content): + counter = 1 + else: print(str(line).strip()) + else: counter -= 1