kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #443 from mslacken/fix-openSUSE-dhcpd

Browse Source 
Fix-openSUSE-dhcpd
This commit is contained in:
Gregory M. Kurtzer
2022-06-08 12:07:56 -07:00
committed by GitHub
parent a641647ba3 ecea7a949f
commit 4d692f8a2f
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/pkg/overlay/overlay.go
View File

@@ -417,12 +417,23 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir
if err != nil {
wwlog.ErrorExc(err, "")
}
if util.IsFile(path.Join(outputDir, location)) {
if !util.IsFile(path.Join(outputDir, location+".wwbackup")) {
wwlog.Debug("Target exists, creating backup file")
err = os.Rename(path.Join(outputDir, location), path.Join(outputDir, location+"wwbackup"))
} else {
wwlog.Debug("%s exists, keeping the backup file", path.Join(outputDir, location+".wwbackup"))
err = os.Remove(path.Join(outputDir, location))
}
if err != nil {
wwlog.ErrorExc(err, "")
}
}
err = os.Symlink(destination, path.Join(outputDir, location))
if err != nil {
wwlog.ErrorExc(err, "")
}
} else {
err := util.CopyFile(location, path.Join(outputDir, location))
if err == nil {
wwlog.Debug("Copied file into overlay: %s", location)

1
overlays/host/etc/dhcpd.conf Symbolic link
View File

@@ -0,0 +1 @@
dhcp/dhcpd.conf