Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Дмитрий Корытько
/
hware
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit
f3ab60d9
...
f3ab60d9461aa2eda3a41ba51d422d2952d2c23b
authored
2015-10-06 10:24:07 +0300
by
root
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
save
1 parent
99121cd3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
17 deletions
DevTools/pom.xml
DevTools/repo/org/emercit/utilstools/maven-metadata.xml
DevTools/repo/org/emercit/utilstools/maven-metadata.xml.md5
DevTools/repo/org/emercit/utilstools/maven-metadata.xml.sha1
SzsBb/pom.xml
UtilsTools/src/main/java/org/emercit/utilstools/ethmanager/service/EthLinux.java
UtilsTools/src/main/java/org/emercit/utilstools/service/Settings.java
DevTools/pom.xml
View file @
f3ab60d
...
...
@@ -147,7 +147,7 @@
<dependency>
<groupId>
org.emercit
</groupId>
<artifactId>
utilstools
</artifactId>
<version>
1.
50
</version>
<version>
1.
87
</version>
</dependency>
<dependency>
...
...
DevTools/repo/org/emercit/utilstools/maven-metadata.xml
View file @
f3ab60d
...
...
@@ -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>
2015
0812065914
</lastUpdated>
<lastUpdated>
2015
1002125315
</lastUpdated>
</versioning>
</metadata>
...
...
DevTools/repo/org/emercit/utilstools/maven-metadata.xml.md5
View file @
f3ab60d
b608ba80436a86a0616f055bcc8a8a65
\ No newline at end of file
ddd4c1c39b91ce9213cc8b5976d1505c
\ No newline at end of file
...
...
DevTools/repo/org/emercit/utilstools/maven-metadata.xml.sha1
View file @
f3ab60d
5fd4e8f6aa6d6094cf2b61baee024dc673b79784
\ No newline at end of file
ae718c68416dc753115d6bb47736df98f4d8bd3d
\ No newline at end of file
...
...
SzsBb/pom.xml
View file @
f3ab60d
...
...
@@ -67,7 +67,7 @@
<dependency>
<groupId>
org.emercit
</groupId>
<artifactId>
utilstools
</artifactId>
<version>
1.
50
</version>
<version>
1.
85
</version>
</dependency>
...
...
UtilsTools/src/main/java/org/emercit/utilstools/ethmanager/service/EthLinux.java
View file @
f3ab60d
...
...
@@ -147,7 +147,7 @@ public class EthLinux implements IEth {
}
p
rivate
int
Config
(
Vector
<
EthBean
>
ebs
)
{
p
ublic
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:
ebs
1
)
{
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
(
ebs
Def
==
null
||
ebsDef
.
size
()==
0
)
{
ebs
Def
=
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
(
ebs
Def
);
}
}
...
...
UtilsTools/src/main/java/org/emercit/utilstools/service/Settings.java
View file @
f3ab60d
...
...
@@ -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
());
...
...
Please
register
or
sign in
to post a comment