diff --git a/chameleon-client/src/views/SettingsViewes/General.vue b/chameleon-client/src/views/SettingsViewes/General.vue
index d8a6e995c..55dcf6472 100644
--- a/chameleon-client/src/views/SettingsViewes/General.vue
+++ b/chameleon-client/src/views/SettingsViewes/General.vue
@@ -15,7 +15,7 @@
Save General Settings
Install or Update:
-
+
@@ -23,14 +23,14 @@
Choose a newer version:
-
+
{{fileUploadText}}
+ width="4"/>
Please wait this may take a while
@@ -69,8 +69,19 @@
this.axios.post("http://" + this.$address + "/api/settings/general", this.settings).then(
function (response) {
if (response.status === 200) {
- self.$store.state.saveBar = true;
+ self.snackbar = {
+ color: "success",
+ text: "Save successful, Please restart for changes to take action"
+ };
+ self.snack = true;
}
+ },
+ function (error) {
+ self.snackbar = {
+ color: "error",
+ text: error.response.data
+ };
+ self.snack = true;
}
)
},
diff --git a/chameleon-server/pom.xml b/chameleon-server/pom.xml
index 731e19ce5..48a596f1f 100644
--- a/chameleon-server/pom.xml
+++ b/chameleon-server/pom.xml
@@ -6,7 +6,7 @@
org.chameleon-vision.main
chameleon-vision
- 2.3.1-RELEASE
+ 2.3.1-BUGFIX
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 58a904172..47ae1a47d 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/network/LinuxNetworking.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/network/LinuxNetworking.java
@@ -71,9 +71,10 @@ public class LinuxNetworking extends SysNetworking {
lines.add("interface " + networkInterface.name);
InetAddress iNetMask = InetAddress.getByName(netmask);
int prefix = NetmaskToCIDR.convertNetmaskToCIDR(iNetMask);
- lines.add("static ip_address " + ipAddress + "/" + prefix);
- lines.add("static routers " + gateway);
+ lines.add("static ip_address=" + ipAddress + "/" + prefix);
+ lines.add("static routers=" + gateway);
FileUtils.writeLines(dhcpConf, lines);
+ return true;
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
index 905bf73d9..032ec6e6e 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
@@ -57,8 +57,8 @@ public class RequestHandler {
// setting up network config after saving
boolean isStatic = ConfigManager.settings.connectionType.equals(NetworkIPMode.STATIC);
- if (NetworkManager.setHostname(ConfigManager.settings.hostname) &&
- NetworkManager.setNetwork(isStatic, ConfigManager.settings.ip, ConfigManager.settings.netmask, ConfigManager.settings.gateway)) {
+ boolean state = NetworkManager.setHostname(ConfigManager.settings.hostname) && NetworkManager.setNetwork(isStatic, ConfigManager.settings.ip, ConfigManager.settings.netmask, ConfigManager.settings.gateway);
+ if (state) {
ctx.status(200);
} else {
ctx.result("Something went wrong while setting network configuration");