From daa3e79afdd8614231fdfb23fea6f8854b49475f Mon Sep 17 00:00:00 2001 From: onefang Date: Fri, 10 Sep 2021 11:27:26 +1000 Subject: Give Sandbox sim a new UUID if we use it. --- example/etc/Sandbox.shini | 2 +- src/sledjchisl/sledjchisl.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/example/etc/Sandbox.shini b/example/etc/Sandbox.shini index d356923..75e94e2 100755 --- a/example/etc/Sandbox.shini +++ b/example/etc/Sandbox.shini @@ -3,7 +3,7 @@ [Region] RegionName = "Sandbox" - RegionUUID = "7ed49d7a-6b50-4415-9991-3720e8f884d5" + RegionUUID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" Location = "100,100" SizeX = 256 SizeY = 256 diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index 6c1b5bb..ece9259 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c @@ -1805,7 +1805,10 @@ simList *getSims() // If there's no sims, create the default Sandbox. if (0 == ourSims->num) { - if (shellMeFail("cp %s/current/example/etc/Sandbox.shini %s/etc/", scRoot, scRoot)) E("Failed to copy Sandbex.shini!"); + // Give it a new UUID. Think that's why I can't HG from DG, coz that's the same UUID on both grids. + create_uuid(toybuf); + if (shellMeFail("sed -E -e 's/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/%s/' %s/current/example/etc/Sandbox.shini >%s/etc/Sandbox.shini", + show_uuid(toybuf), scRoot, scRoot)) E("Failed to sed Sandbex.shini!"); simNotFound(NULL, "Sandbox", "unsorted", 0, 0, 0, 0); if ((ourSims->num + 1) > ourSims->len) { -- cgit v1.1