fix: [close #161] Force upgrade image digest label

* fix missing digest on image force upgrade * fix writing old image digest to recipe
Vanilla-OS · Dec 13, 2023 · 24951bc · 24951bc
1 parent 8c0d484
commit 24951bc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/system.go b/core/system.go
@@ -528,6 +528,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation) error {
 				PrintVerbose("ABSystemRunOperation:err(1.1): %s", err)
 				return NoUpdateError
 			}
+			imageDigest = s.CurImage.Digest
 			PrintVerbose("ABSystemRunOperation: No update available but --force is set. Proceeding...")
 		}
 	} else {
@@ -627,7 +628,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation) error {
 		}
 	} else {
 		imageName = settings.Cnf.FullImageName + "@" + imageDigest
-		labels["ABRoot.BaseImageDigest"] = s.CurImage.Digest
+		labels["ABRoot.BaseImageDigest"] = imageDigest
 	}
 
 	// Delete old image