explicitly mount and unmount /var for os files handling (#602)

suse-edge · Oct 31, 2024 · 6a5d7a4 · 6a5d7a4
1 parent 2616422
commit 6a5d7a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -12,6 +12,7 @@
 
 ## Bug Fixes
 
+* [#593](https://github.com/suse-edge/edge-image-builder/issues/593) - OS files script should mount /var
 * [#594](https://github.com/suse-edge/edge-image-builder/issues/594) - Package install breaks package resolution if packages is already installed on root OS
 
 ---

diff --git a/pkg/combustion/osfiles_test.go b/pkg/combustion/osfiles_test.go
@@ -48,7 +48,9 @@ func TestConfigureOSFiles(t *testing.T) {
 	expectedCombustionScript := filepath.Join(ctx.CombustionDir, osFilesScriptName)
 	contents, err := os.ReadFile(expectedCombustionScript)
 	require.NoError(t, err)
+	assert.Contains(t, string(contents), "mount /var")
 	assert.Contains(t, string(contents), "cp -R")
+	assert.Contains(t, string(contents), "umount /var")
 
 	// -- Files
 	expectedFile := filepath.Join(ctx.CombustionDir, osFilesConfigDir, "etc", "ssh", "test-config-file")

diff --git a/pkg/combustion/templates/19-copy-os-files.sh b/pkg/combustion/templates/19-copy-os-files.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 set -euo pipefail
 
+mount /var
 cp -R ./os-files/* /
+umount /var