rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-07 01:30:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Add missing dependency to bind mounts (#102)

Browse Source 
As overlay mounts its responsible of mounting some of the RW paths that
bind mounts are using (for example /etc) we need to depend on it and let
it finish before running ht ebind mounts

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
This commit is contained in:
Itxaka
2023-03-21 10:58:15 +01:00
committed by GitHub
parent 8d83ba755c
commit 2534577e09
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/mount/state_test.go
View File

@@ -82,7 +82,7 @@ func checkLiveCDDag(dag [][]herd.GraphEntry, actualDag string) {
}
func checkDag(dag [][]herd.GraphEntry, actualDag string) {
Expect(len(dag)).To(Equal(11), actualDag)
Expect(len(dag)).To(Equal(12), actualDag)
Expect(len(dag[0])).To(Equal(1), actualDag)
Expect(len(dag[1])).To(Equal(3), actualDag)
Expect(len(dag[2])).To(Equal(1), actualDag)
@@ -91,9 +91,10 @@ func checkDag(dag [][]herd.GraphEntry, actualDag string) {
Expect(len(dag[5])).To(Equal(1), actualDag)
Expect(len(dag[6])).To(Equal(1), actualDag)
Expect(len(dag[7])).To(Equal(2), actualDag)
Expect(len(dag[8])).To(Equal(2), actualDag)
Expect(len(dag[8])).To(Equal(1), actualDag)
Expect(len(dag[9])).To(Equal(1), actualDag)
Expect(len(dag[10])).To(Equal(1), actualDag)
Expect(len(dag[11])).To(Equal(1), actualDag)
Expect(dag[0][0].Name).To(Equal("init"))
Expect(dag[1][0].Name).To(Or(
@@ -118,8 +119,8 @@ func checkDag(dag [][]herd.GraphEntry, actualDag string) {
Expect(dag[6][0].Name).To(Equal(cnst.OpLoadConfig), actualDag)
Expect(dag[7][0].Name).To(Or(Equal(cnst.OpMountBaseOverlay), Equal(cnst.OpCustomMounts)), actualDag)
Expect(dag[7][1].Name).To(Or(Equal(cnst.OpMountBaseOverlay), Equal(cnst.OpCustomMounts)), actualDag)
Expect(dag[8][0].Name).To(Or(Equal(cnst.OpMountBind), Equal(cnst.OpOverlayMount)), actualDag)
Expect(dag[8][1].Name).To(Or(Equal(cnst.OpMountBind), Equal(cnst.OpOverlayMount)), actualDag)
Expect(dag[9][0].Name).To(Equal(cnst.OpWriteFstab), actualDag)
Expect(dag[10][0].Name).To(Equal(cnst.OpInitramfsHook), actualDag)
Expect(dag[8][0].Name).To(Equal(cnst.OpOverlayMount), actualDag)
Expect(dag[9][0].Name).To(Equal(cnst.OpMountBind), actualDag)
Expect(dag[10][0].Name).To(Equal(cnst.OpWriteFstab), actualDag)
Expect(dag[11][0].Name).To(Equal(cnst.OpInitramfsHook), actualDag)
}