Commit f3ab60d9 f3ab60d9461aa2eda3a41ba51d422d2952d2c23b by root

save

1 parent 99121cd3
......@@ -147,7 +147,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.50</version>
<version>1.87</version>
</dependency>
<dependency>
......
......@@ -3,7 +3,7 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.50</release>
<release>1.87</release>
<versions>
<version>1.0</version>
<version>1.1</version>
......@@ -51,7 +51,9 @@
<version>1.45</version>
<version>1.46</version>
<version>1.50</version>
<version>1.85</version>
<version>1.87</version>
</versions>
<lastUpdated>20150812065914</lastUpdated>
<lastUpdated>20151002125315</lastUpdated>
</versioning>
</metadata>
......
b608ba80436a86a0616f055bcc8a8a65
\ No newline at end of file
ddd4c1c39b91ce9213cc8b5976d1505c
\ No newline at end of file
......
5fd4e8f6aa6d6094cf2b61baee024dc673b79784
\ No newline at end of file
ae718c68416dc753115d6bb47736df98f4d8bd3d
\ No newline at end of file
......
......@@ -67,7 +67,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.50</version>
<version>1.85</version>
</dependency>
......
......@@ -147,7 +147,7 @@ public class EthLinux implements IEth {
}
private int Config(Vector<EthBean> ebs) {
public int Config(Vector<EthBean> ebs1) {
try {
File file = new File("/etc/network/interfaces");
......@@ -166,7 +166,7 @@ public class EthLinux implements IEth {
bw.write("\n");
bw.write("\n");
for (EthBean eb:ebs) {
for (EthBean eb:ebs1) {
if (!eb.getDhcp()) {
......@@ -214,12 +214,12 @@ public class EthLinux implements IEth {
public int setDefaults() {
ebs=new Vector<EthBean>();
Vector<EthBean> ebsDef=new Vector<EthBean>();
Vector<String> v=new Vector<String>();
v.add("");
if (ebs==null || ebs.size()==0) {
ebs=new Vector<EthBean>();
if (ebsDef==null || ebsDef.size()==0) {
ebsDef=new Vector<EthBean>();
EthBean NewEb=new EthBean();
//Eth0
......@@ -231,8 +231,7 @@ public class EthLinux implements IEth {
NewEb.setGateway(DefSettings.Eth0_gateway);
NewEb.setInfo(v);
NewEb.setId(DefSettings.Eth0_id);
ebs.add(NewEb);
ebsDef.add(NewEb);
//Eth1
/*
......@@ -252,7 +251,7 @@ public class EthLinux implements IEth {
*/
}
return Config(ebs);
return Config(ebsDef);
}
}
......
......@@ -70,10 +70,15 @@ public class Settings implements ISettings {
gsm.set(model.getGsmbean());
for (EthBean eb:model.getEthbeans()) {
//for (EthBean eb:model.getEthbeans()) {
ethlinux.Update(eb);
}
//ethlinux.Update(eb);
//}
ethlinux.Config(model.getEthbeans());
proxylinux.Config(model.getProxybeans());
......