Restore server network auto-detection
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
@@ -16,7 +16,7 @@ func Test_fstabOverlay(t *testing.T) {
|
||||
defer env.RemoveAll()
|
||||
env.ImportFile("etc/warewulf/nodes.conf", "nodes.conf")
|
||||
env.ImportFile("etc/warewulf/warewulf.conf", "warewulf.conf")
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf")))
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf"), false))
|
||||
env.ImportFile("var/lib/warewulf/overlays/fstab/rootfs/etc/fstab.ww", "../rootfs/etc/fstab.ww")
|
||||
|
||||
tests := []struct {
|
||||
|
||||
@@ -86,7 +86,7 @@ func Test_hostOverlay(t *testing.T) {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if tt.conf != "" {
|
||||
env.ImportFile("etc/warewulf/warewulf.conf", tt.conf)
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf")))
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf"), false))
|
||||
}
|
||||
cmd := show.GetCommand()
|
||||
cmd.SetArgs(tt.args)
|
||||
|
||||
@@ -19,7 +19,7 @@ func Test_hostsOverlay(t *testing.T) {
|
||||
env := testenv.New(t)
|
||||
defer env.RemoveAll()
|
||||
env.ImportFile("etc/warewulf/warewulf.conf", "warewulf.conf")
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf")))
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf"), false))
|
||||
env.ImportFile("etc/warewulf/nodes.conf", "nodes.conf")
|
||||
env.ImportFile("var/lib/warewulf/overlays/hosts/rootfs/etc/hosts.ww", "../rootfs/etc/hosts.ww")
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ func Test_localtimeOverlay(t *testing.T) {
|
||||
env := testenv.New(t)
|
||||
defer env.RemoveAll()
|
||||
env.ImportFile("etc/warewulf/nodes.conf", "nodes.conf")
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf")))
|
||||
assert.NoError(t, config.Get().Read(env.GetPath("etc/warewulf/warewulf.conf"), false))
|
||||
env.ImportFile("var/lib/warewulf/overlays/localtime/rootfs/etc/localtime.ww", "../rootfs/etc/localtime.ww")
|
||||
|
||||
tests := []struct {
|
||||
|
||||
Reference in New Issue
Block a user