WIP: fixing view layers to create a new sandbox

darstahl · darstahl · commit 699f2d2c30f0 · 2018-05-04T17:12:43.000-07:00
Signed-off-by: Darren Stahl &lt;darst@microsoft.com&gt;
diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go
@@ -297,21 +297,21 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
 		return nil, errors.Wrap(err, "failed to create snapshot")
 	}
 
-	if kind == snapshots.KindActive {
-		parentLayerPaths := s.parentIDsToParentPaths(newSnapshot.ParentIDs)
+	//if kind == snapshots.KindActive {
+	parentLayerPaths := s.parentIDsToParentPaths(newSnapshot.ParentIDs)
 
-		var parentPath string
-		if len(parentLayerPaths) != 0 {
-			parentPath = parentLayerPaths[0]
-		}
-
-		if err := hcsshim.CreateSandboxLayer(s.info, newSnapshot.ID, parentPath, parentLayerPaths); err != nil {
-			return nil, errors.Wrap(err, "failed to create sandbox layer")
-		}
+	var parentPath string
+	if len(parentLayerPaths) != 0 {
+		parentPath = parentLayerPaths[0]
+	}
 
-		// TODO(darrenstahlmsft): Allow changing sandbox size
+	if err := hcsshim.CreateSandboxLayer(s.info, newSnapshot.ID, parentPath, parentLayerPaths); err != nil {
+		return nil, errors.Wrap(err, "failed to create sandbox layer")
 	}
 
+	// TODO(darrenstahlmsft): Allow changing sandbox size
+	//}
+
 	if err := t.Commit(); err != nil {
 		return nil, errors.Wrap(err, "commit failed")
 	}
