Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nm): Fixed dnsmasq behavior on configuration change #5295

Merged
merged 1 commit into from
Jun 27, 2024
Merged

fix(nm): Fixed dnsmasq behavior on configuration change #5295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...e.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMConfigurationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import org.eclipse.kura.KuraErrorCode;
import org.eclipse.kura.KuraException;
import org.eclipse.kura.configuration.ComponentConfiguration;
Expand Down Expand Up @@ -505,11 +506,11 @@ private void writeDhcpServerConfiguration(Set<String> interfaceNames) {
DhcpServerConfigWriter dhcpServerConfigWriter = buildDhcpServerConfigWriter(interfaceName,
this.networkProperties);
try {
dhcpServerConfigWriter.writeConfiguration();
this.dhcpServerMonitor.putDhcpServerInterfaceConfiguration(interfaceName, true);
this.dhcpServerMonitor.disable(interfaceName); // Side effect: we rely on the monitor bringing the
// server back up so that the configuration change
// takes effect
dhcpServerConfigWriter.writeConfiguration();
this.dhcpServerMonitor.putDhcpServerInterfaceConfiguration(interfaceName, true);

} catch (UnknownHostException | KuraException e) {
logger.error("Failed to write DHCP Server configuration", e);
Expand Down
Loading