diff --git a/chameleon-client/src/views/SettingsViewes/General.vue b/chameleon-client/src/views/SettingsViewes/General.vue index 624edc8ab..d8a6e995c 100644 --- a/chameleon-client/src/views/SettingsViewes/General.vue +++ b/chameleon-client/src/views/SettingsViewes/General.vue @@ -104,7 +104,7 @@ computed: { fileUploadText() { if (this.file !== undefined) { - return "update and run at startup" + return "Update and run at startup" } else { return "Run current version at startup" } diff --git a/chameleon-server/src/main/java/com/chameleonvision/network/LinuxNetworking.java b/chameleon-server/src/main/java/com/chameleonvision/network/LinuxNetworking.java index 2794f0c9a..58a904172 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/network/LinuxNetworking.java +++ b/chameleon-server/src/main/java/com/chameleonvision/network/LinuxNetworking.java @@ -22,7 +22,7 @@ public class LinuxNetworking extends SysNetworking { List lines = FileUtils.readLines(dhcpConf, StandardCharsets.UTF_8); for (int i = 0; i < lines.size(); i++) { String line = lines.get(i); - if (line.contains("interface " + networkInterface.name)) { + if (line.startsWith("interface " + networkInterface.name)) { lines.remove(i); for (int j = i; j < lines.size(); j++) { String subInterface = lines.get(j); diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java index dd003a575..f29dc932a 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java @@ -354,7 +354,7 @@ public class SolvePNPPipe implements Pipe