From 85fa80de1d6d400ac295f5432eb9948dc405611e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 13 Jun 2023 14:57:31 +0200
Subject: [minilinux] Stricter check for stage 4 availability

---
 modules-available/minilinux/inc/minilinux.inc.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php
index 4960284f..09daf6c0 100644
--- a/modules-available/minilinux/inc/minilinux.inc.php
+++ b/modules-available/minilinux/inc/minilinux.inc.php
@@ -411,12 +411,22 @@ class MiniLinux
 		}
 		if ($image === false)
 			return true; // No stage4
-		$mask = $rid;
 		if ($rid === 0) {
-			$mask = '*';
+			// Get latest local revision
+			foreach (glob(CONFIG_VMSTORE_DIR . '/' . $image . '.r*', GLOB_NOSORT) as $file) {
+				if (preg_match('/\.r(\d+)$/', $file, $out)) {
+					$cmp = (int)$out[1];
+					if ($cmp > $rid) {
+						$rid = $cmp;
+					}
+				}
+			}
+		}
+		if ($rid > 0 && file_exists(CONFIG_VMSTORE_DIR . '/' . $image . '.r' . $rid)
+				&& !file_exists(CONFIG_VMSTORE_DIR . '/' . $image . '.r' . $rid . '.map')) {
+			// Accept if image exists locally and no map file (map file would mean incomplete)
+			return true;
 		}
-		if (glob(CONFIG_VMSTORE_DIR . '/' . $image . '.r' . $mask, GLOB_NOSORT) !== [])
-			return true; // Already exists locally
 		// Not found locally -- try to replicate
 		$sock = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($sock === false) {
-- 
cgit v1.2.3-55-g7522