rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-08-17 13:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable longer RW_PATHS

Browse Source 
Looks like the problem comes from the custom mounts overriding this
values

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
This commit is contained in:
Itxaka 2023-02-22 12:21:02 +01:00
parent 97478bd8ac
commit 9a480df901
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/constants/constants.go
View File

@ -3,9 +3,8 @@ package constants
import "errors" import "errors"
func DefaultRWPaths() []string { func DefaultRWPaths() []string {
// Default RW_PATHS to mount // Default RW_PATHS to mount if not overriden by the cos-layout.env file
// If none defined, your system wont even boot probably return []string{"/etc", "/root", "/home", "/opt", "/srv", "/usr/local", "/var"}
return []string{"/var", "/etc", "/srv"}
} }
var ErrAlreadyMounted = errors.New("already mounted") var ErrAlreadyMounted = errors.New("already mounted")

8
pkg/mount/dag_steps.go
View File

@ -120,9 +120,11 @@ func (s *State) LoadEnvLayoutDagStep(g *herd.Graph) error {
return err return err
} }
// populate from env here // populate from env here
s.OverlayDirs = strings.Split(env["RW_PATHS"], " ") s.OverlayDirs = internalUtils.CleanupSlice(strings.Split(env["RW_PATHS"], " "))
// Append default RW_Paths // Append default RW_Paths if list is empty, otherwise we won't boot properly
s.OverlayDirs = append(s.OverlayDirs, cnst.DefaultRWPaths()...) if len(s.OverlayDirs) == 0 {
s.OverlayDirs = cnst.DefaultRWPaths()
}
// Remove any duplicates // Remove any duplicates
s.OverlayDirs = internalUtils.UniqueSlice(internalUtils.CleanupSlice(s.OverlayDirs)) s.OverlayDirs = internalUtils.UniqueSlice(internalUtils.CleanupSlice(s.OverlayDirs))