Save MainVolume info and rely on it to add the missing system-data st…

…ructure Signed-off-by: Paul Mars <[email protected]>
canonical · Apr 19, 2024 · fa1ecef · fa1ecef
1 parent f533f64
commit fa1ecef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/internal/statemachine/state_machine.go b/internal/statemachine/state_machine.go
@@ -124,6 +124,9 @@ type StateMachine struct {
 	// names of images for each volume
 	VolumeNames map[string]string
 
+	// name of the "main volume"
+	MainVolumeName string
+
 	Packages []string
 	Snaps    []string
 }
@@ -395,10 +398,14 @@ func fixMissingContent(volume *gadget.Volume, structure *gadget.VolumeStructure,
 // Since so far we have no knowledge of the rootfs contents, the
 // size is set to 0, and will be calculated later
 func (stateMachine *StateMachine) fixMissingSystemData(lastVolumeName string, farthestOffset quantity.Offset, farthestOffsetUnknown bool, rootfsSeen bool) {
-	// For now we consider the main volume to be the last one
+	// For now we consider the main volume to be the last one unless it was previously found
 	volume := stateMachine.GadgetInfo.Volumes[lastVolumeName]
 
-	if !farthestOffsetUnknown || !rootfsSeen || len(stateMachine.GadgetInfo.Volumes) == 1 {
+	if len(stateMachine.MainVolumeName) != 0 {
+		volume = stateMachine.GadgetInfo.Volumes[stateMachine.MainVolumeName]
+	}
+
+	if !farthestOffsetUnknown || !rootfsSeen || len(stateMachine.GadgetInfo.Volumes) != 1 {
 		return
 	}
 	rootfsStructure := gadget.VolumeStructure{
@@ -470,6 +477,7 @@ func (stateMachine *StateMachine) loadState(partialStateMachine *StateMachine) e
 	stateMachine.ImageSizes = partialStateMachine.ImageSizes
 	stateMachine.VolumeOrder = partialStateMachine.VolumeOrder
 	stateMachine.VolumeNames = partialStateMachine.VolumeNames
+	stateMachine.MainVolumeName = partialStateMachine.MainVolumeName
 
 	stateMachine.Packages = partialStateMachine.Packages
 	stateMachine.Snaps = partialStateMachine.Snaps

diff --git a/internal/statemachine/testdata/metadata/reference_successful_write.json b/internal/statemachine/testdata/metadata/reference_successful_write.json
@@ -1 +1 @@
-{"CurrentStep":"","StepsTaken":2,"ConfDefPath":"","YamlFilePath":"/tmp/ubuntu-image-2329554237/unpack/gadget/meta/gadget.yaml","IsSeeded":true,"RootfsVolName":"","RootfsPartNum":0,"SectorSize":512,"RootfsSize":775915520,"GadgetInfo":{"Volumes":{"pc":{"schema":"gpt","bootloader":"grub","id":"","structure":[{"name":"mbr","filesystem-label":"","offset":0,"offset-write":null,"min-size":440,"size":440,"type":"mbr","role":"mbr","id":"","filesystem":"","content":[{"source":"","target":"","image":"pc-boot.img","offset":null,"size":0,"unpack":false}],"update":{"edition":1,"preserve":null}}]}},"Defaults":null,"Connections":null,"KernelCmdline":{"Allow":null,"Append":null,"Remove":null}},"ImageSizes":{"pc":3155165184},"VolumeOrder":["pc"],"VolumeNames":{"pc":"pc.img"},"Packages":null,"Snaps":null}
+{"CurrentStep":"","StepsTaken":2,"ConfDefPath":"","YamlFilePath":"/tmp/ubuntu-image-2329554237/unpack/gadget/meta/gadget.yaml","IsSeeded":true,"RootfsVolName":"","RootfsPartNum":0,"SectorSize":512,"RootfsSize":775915520,"GadgetInfo":{"Volumes":{"pc":{"schema":"gpt","bootloader":"grub","id":"","structure":[{"name":"mbr","filesystem-label":"","offset":0,"offset-write":null,"min-size":440,"size":440,"type":"mbr","role":"mbr","id":"","filesystem":"","content":[{"source":"","target":"","image":"pc-boot.img","offset":null,"size":0,"unpack":false}],"update":{"edition":1,"preserve":null}}]}},"Defaults":null,"Connections":null,"KernelCmdline":{"Allow":null,"Append":null,"Remove":null}},"ImageSizes":{"pc":3155165184},"VolumeOrder":["pc"],"VolumeNames":{"pc":"pc.img"},"MainVolumeName":"","Packages":null,"Snaps":null}