New snapshot folder (#6)

* new snapshot folder Unsure when this changes but now snapshots are stored in the root containers folder. * Support Win10 and Win11
thesecretclub · Oct 13, 2024 · cd02e6e · cd02e6e
1 parent c0d5f6e
commit cd02e6e
Showing 1 changed file with 30 additions and 4 deletions.
diff --git a/Installer/Installer.cs b/Installer/Installer.cs
@@ -207,11 +207,37 @@ static int Main(string[] args)
                         Console.WriteLine("Success!");
 
                         // Without this the sandbox can use a snapshot and load the original bootmgfw.efi
-                        var snapshotFolder = Path.Combine(guid, "Snapshot");
-                        if (Directory.Exists(snapshotFolder))
+                        // Win10: Containers/BaseImages/{GUID}/Snapshot
+                        // Win11: Microsoft/Windows/Containers/Snapshots/{GUID}
+                        var snapshotFolderWin11 = Path.Combine(programData, "Microsoft", "Windows", "Containers", "Snapshots");
+                        var snapshotFolderWin10 = Path.Combine(guid, "Snapshot");
+                        var snapshotDeleted = false;
+
+                        if (Directory.Exists(snapshotFolderWin11))
+                        {
+                            foreach(var snapshot in Directory.EnumerateDirectories(snapshotFolderWin11))
+                            {
+                                Directory.Delete(snapshot, true);
+                                Info($"Deleted snapshot: {snapshot}");
+                            }
+
+                            snapshotDeleted = true;
+                        }
+                        else if (Directory.Exists(snapshotFolderWin10))
+                        {
+                            Directory.Delete(snapshotFolderWin10, true);
+
+                            Info($"Delted snapshot folder: {snapshotFolderWin10}");
+
+                            snapshotDeleted = true;
+                        }
+                        else
+                        {
+                            Info($"Snapshot folder not found: {snapshotFolderWin11} or {snapshotFolderWin10}, not restarting CmService");
+                        }
+
+                        if (snapshotDeleted)
                         {
-                            Info($"Deleting sandbox snapshots");
-                            Directory.Delete(snapshotFolder, true);
                             Info($"Restarting CmService");
                             Exec("sc", "stop CmService");
                             WaitForService("CmService", "STOPPED");