From a828dcade98b13844cf4d28f040a452310e30f5a Mon Sep 17 00:00:00 2001 From: Sandhya Dasu Date: Fri, 13 May 2022 10:17:23 -0400 Subject: [PATCH] Copy hostname into /sysroot/etc/NetworkManager/dispatcher.d also In addition to providing the desited hostname of the machine in the /etc/NetworkManager/dispatcher.d path also provide it in /sysroot/etc/NetworkManager/dispatcher.d --- pkg/ignition/builder.go | 5 +++++ pkg/ignition/builder_test.go | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/ignition/builder.go b/pkg/ignition/builder.go index 0b24913c..44a4ada1 100644 --- a/pkg/ignition/builder.go +++ b/pkg/ignition/builder.go @@ -121,6 +121,11 @@ func (b *ignitionBuilder) GenerateConfig() (config ignition_config_types_32.Conf "/etc/NetworkManager/dispatcher.d/01-hostname", 0744, false, []byte(update_hostname))) + + config.Storage.Files = append(config.Storage.Files, ignitionFileEmbed( + "/sysroot/etc/NetworkManager/dispatcher.d/01-hostname", + 0744, false, + []byte(update_hostname))) } if len(b.registriesConf) > 0 { diff --git a/pkg/ignition/builder_test.go b/pkg/ignition/builder_test.go index 226498b7..9e6d8baa 100644 --- a/pkg/ignition/builder_test.go +++ b/pkg/ignition/builder_test.go @@ -41,7 +41,7 @@ func TestGenerateWithMoreFields(t *testing.T) { assert.Equal(t, "3.2.0", ignition.Ignition.Version) assert.Len(t, ignition.Systemd.Units, 1) - assert.Len(t, ignition.Storage.Files, 5) + assert.Len(t, ignition.Storage.Files, 6) assert.Len(t, ignition.Passwd.Users, 1) // Sanity-check only @@ -50,7 +50,8 @@ func TestGenerateWithMoreFields(t *testing.T) { assert.Equal(t, ignition.Storage.Files[1].Path, "/etc/authfile.json") assert.Equal(t, ignition.Storage.Files[2].Path, "/etc/NetworkManager/conf.d/clientid.conf") assert.Equal(t, ignition.Storage.Files[3].Path, "/etc/NetworkManager/dispatcher.d/01-hostname") - assert.Equal(t, ignition.Storage.Files[4].Path, "/etc/containers/registries.conf") + assert.Equal(t, ignition.Storage.Files[4].Path, "/sysroot/etc/NetworkManager/dispatcher.d/01-hostname") + assert.Equal(t, ignition.Storage.Files[5].Path, "/etc/containers/registries.conf") assert.Equal(t, ignition.Passwd.Users[0].Name, "core") assert.Len(t, ignition.Passwd.Users[0].SSHAuthorizedKeys, 1) }