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

Removed /etc/network/interfaces.tmp after it has been consumed #3872

Merged
merged 2 commits into from
Mar 15, 2022
Merged

Removed /etc/network/interfaces.tmp after it has been consumed #3872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e87d455
Removed /etc/network/interfaces.tmp after it has been consumed
marcellorinaldo Mar 14, 2022
f97c512
Applied same changes to linux.redhat.provider
marcellorinaldo Mar 14, 2022
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
12 changes: 7 additions & 5 deletions ...rg/eclipse/kura/internal/linux/net/config/NetInterfaceConfigSerializationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,21 +430,23 @@ private void writeConfigFile(String tmpFileName, String dstFileName, StringBuild
}

// move tmp configuration file into its final destination
copyConfigFile(srcFile, dstFile);
copyAndDeleteTmpConfigFile(srcFile, dstFile);
}

private void copyConfigFile(File srcFile, File dstFile) throws KuraException {
private void copyAndDeleteTmpConfigFile(File tmpSrcFile, File dstFile) throws KuraException {
try {
if (!FileUtils.contentEquals(srcFile, dstFile)) {
if (!FileUtils.contentEquals(tmpSrcFile, dstFile)) {
// File.renameTo performs rather badly on Windows, if the file already exists
Files.move(Paths.get(srcFile.getAbsolutePath()), Paths.get(dstFile.getAbsolutePath()),
Files.move(Paths.get(tmpSrcFile.getAbsolutePath()), Paths.get(dstFile.getAbsolutePath()),
StandardCopyOption.REPLACE_EXISTING);
} else {
logger.info("Not rewriting network interfaces file because it is the same");
}

Files.deleteIfExists(Paths.get(tmpSrcFile.getAbsolutePath()));
} catch (IOException e) {
throw new KuraIOException(e,
"Failed to rename tmp config file " + srcFile.getName() + " to " + dstFile.getName());
"Failed to rename tmp config file " + tmpSrcFile.getName() + " to " + dstFile.getName());
}
}

Expand Down
12 changes: 7 additions & 5 deletions ...rg/eclipse/kura/internal/linux/net/config/NetInterfaceConfigSerializationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,21 +236,23 @@ private void writeConfigFile(String tmpFileName, String dstFileName, StringBuild
}

// move tmp configuration file into its final destination
copyConfigFile(srcFile, dstFile);
copyAndDeleteTmpConfigFile(srcFile, dstFile);
}

private void copyConfigFile(File srcFile, File dstFile) throws KuraException {
private void copyAndDeleteTmpConfigFile(File tmpSrcFile, File dstFile) throws KuraException {
try {
if (!FileUtils.contentEquals(srcFile, dstFile)) {
if (!FileUtils.contentEquals(tmpSrcFile, dstFile)) {
// File.renameTo performs rather badly on Windows, if the file already exists
Files.move(Paths.get(srcFile.getAbsolutePath()), Paths.get(dstFile.getAbsolutePath()),
Files.move(Paths.get(tmpSrcFile.getAbsolutePath()), Paths.get(dstFile.getAbsolutePath()),
StandardCopyOption.REPLACE_EXISTING);
} else {
logger.info("Not rewriting network interfaces file because it is the same");
}

Files.deleteIfExists(Paths.get(tmpSrcFile.getAbsolutePath()));
} catch (IOException e) {
throw new KuraIOException(e,
"Failed to rename tmp config file " + srcFile.getName() + " to " + dstFile.getName());
"Failed to rename tmp config file " + tmpSrcFile.getName() + " to " + dstFile.getName());
}
}
}